1818import org .w3c .dom .NodeList ;
1919
2020import javax .imageio .ImageIO ;
21+ import javax .net .ssl .HttpsURLConnection ;
2122
2223import java .awt .image .BufferedImage ;
2324import java .io .IOException ;
2425import java .io .InputStream ;
25- import java .net .HttpURLConnection ;
2626import java .net .URL ;
2727import java .text .DateFormat ;
2828import java .text .SimpleDateFormat ;
@@ -188,10 +188,10 @@ public void delete(String photoId) throws FlickrException {
188188 * @throws FlickrException
189189 */
190190 public PhotoAllContext getAllContexts (String photoId ) throws FlickrException {
191- PhotoSetList <PhotoSet > setList = new PhotoSetList <PhotoSet >();
192- PoolList <Pool > poolList = new PoolList <Pool >();
193- PhotoAllContext allContext = new PhotoAllContext ();
194-
191+ PhotoSetList <PhotoSet > setList = new PhotoSetList <PhotoSet >();
192+ PoolList <Pool > poolList = new PoolList <Pool >();
193+ PhotoAllContext allContext = new PhotoAllContext ();
194+
195195 Map <String , Object > parameters = new HashMap <String , Object >();
196196 parameters .put ("method" , METHOD_GET_ALL_CONTEXTS );
197197
@@ -203,35 +203,35 @@ public PhotoAllContext getAllContexts(String photoId) throws FlickrException {
203203 }
204204 Collection <Element > photosElement = response .getPayloadCollection ();
205205
206- for (Element setElement : photosElement ) {
207- if (setElement .getTagName ().equals ("set" )){
208- PhotoSet pset = new PhotoSet ();
209- pset .setTitle (setElement .getAttribute ("title" ));
210- pset .setSecret (setElement .getAttribute ("secret" ));
211- pset .setId (setElement .getAttribute ("id" ));
212- pset .setFarm (setElement .getAttribute ("farm" ));
213- pset .setPrimary (setElement .getAttribute ("primary" ));
214- pset .setServer (setElement .getAttribute ("server" ));
215- pset .setViewCount (Integer .parseInt (setElement .getAttribute ("view_count" )));
216- pset .setCommentCount (Integer .parseInt (setElement .getAttribute ("comment_count" )));
217- pset .setCountPhoto (Integer .parseInt (setElement .getAttribute ("count_photo" )));
218- pset .setCountVideo (Integer .parseInt (setElement .getAttribute ("count_video" )));
219- setList .add (pset );
220- allContext .setPhotoSetList (setList );
221- } else if (setElement .getTagName ().equals ("pool" )){
222- Pool pool = new Pool ();
223- pool .setTitle (setElement .getAttribute ("title" ));
224- pool .setId (setElement .getAttribute ("id" ));
225- pool .setUrl (setElement .getAttribute ("url" ));
226- pool .setIconServer (setElement .getAttribute ("iconserver" ));
227- pool .setIconFarm (setElement .getAttribute ("iconfarm" ));
228- pool .setMemberCount (Integer .parseInt (setElement .getAttribute ("members" )));
229- pool .setPoolCount (Integer .parseInt (setElement .getAttribute ("pool_count" )));
230- poolList .add (pool );
231- allContext .setPoolList (poolList );
232- }
233- }
234-
206+ for (Element setElement : photosElement ) {
207+ if (setElement .getTagName ().equals ("set" )) {
208+ PhotoSet pset = new PhotoSet ();
209+ pset .setTitle (setElement .getAttribute ("title" ));
210+ pset .setSecret (setElement .getAttribute ("secret" ));
211+ pset .setId (setElement .getAttribute ("id" ));
212+ pset .setFarm (setElement .getAttribute ("farm" ));
213+ pset .setPrimary (setElement .getAttribute ("primary" ));
214+ pset .setServer (setElement .getAttribute ("server" ));
215+ pset .setViewCount (Integer .parseInt (setElement .getAttribute ("view_count" )));
216+ pset .setCommentCount (Integer .parseInt (setElement .getAttribute ("comment_count" )));
217+ pset .setCountPhoto (Integer .parseInt (setElement .getAttribute ("count_photo" )));
218+ pset .setCountVideo (Integer .parseInt (setElement .getAttribute ("count_video" )));
219+ setList .add (pset );
220+ allContext .setPhotoSetList (setList );
221+ } else if (setElement .getTagName ().equals ("pool" )) {
222+ Pool pool = new Pool ();
223+ pool .setTitle (setElement .getAttribute ("title" ));
224+ pool .setId (setElement .getAttribute ("id" ));
225+ pool .setUrl (setElement .getAttribute ("url" ));
226+ pool .setIconServer (setElement .getAttribute ("iconserver" ));
227+ pool .setIconFarm (setElement .getAttribute ("iconfarm" ));
228+ pool .setMemberCount (Integer .parseInt (setElement .getAttribute ("members" )));
229+ pool .setPoolCount (Integer .parseInt (setElement .getAttribute ("pool_count" )));
230+ poolList .add (pool );
231+ allContext .setPoolList (poolList );
232+ }
233+ }
234+
235235 return allContext ;
236236
237237 }
@@ -732,7 +732,7 @@ public Collection<Size> getSizes(String photoId) throws FlickrException {
732732 * @throws FlickrException
733733 */
734734 public Collection <Size > getSizes (String photoId , boolean sign ) throws FlickrException {
735- SizeList <Size > sizes = new SizeList <Size >();
735+ SizeList <Size > sizes = new SizeList <Size >();
736736
737737 Map <String , Object > parameters = new HashMap <String , Object >();
738738 parameters .put ("method" , METHOD_GET_SIZES );
@@ -1369,22 +1369,20 @@ public InputStream getImageAsStream(Photo photo, int size) throws FlickrExceptio
13691369 } else if (size == Size .MEDIUM_800 ) {
13701370 urlStr = photo .getMedium800Url ();
13711371 } else if (size == Size .VIDEO_ORIGINAL ) {
1372- urlStr = photo .getVideoOriginalUrl ();
1372+ urlStr = photo .getVideoOriginalUrl ();
13731373 } else if (size == Size .VIDEO_PLAYER ) {
1374- urlStr = photo .getVideoPlayerUrl ();
1374+ urlStr = photo .getVideoPlayerUrl ();
13751375 } else if (size == Size .SITE_MP4 ) {
1376- urlStr = photo .getSiteMP4Url ();
1377- }
1378- else if (size == Size .MOBILE_MP4 ) {
1379- urlStr = photo .getMobileMp4Url ();
1380- }
1381- else if (size == Size .HD_MP4 ) {
1382- urlStr = photo .getHdMp4Url ();
1383- } else {
1376+ urlStr = photo .getSiteMP4Url ();
1377+ } else if (size == Size .MOBILE_MP4 ) {
1378+ urlStr = photo .getMobileMp4Url ();
1379+ } else if (size == Size .HD_MP4 ) {
1380+ urlStr = photo .getHdMp4Url ();
1381+ } else {
13841382 throw new FlickrException ("0" , "Unknown Photo-size" );
13851383 }
13861384 URL url = new URL (urlStr );
1387- HttpURLConnection conn = (HttpURLConnection ) url .openConnection ();
1385+ HttpsURLConnection conn = (HttpsURLConnection ) url .openConnection ();
13881386 if (transport instanceof REST ) {
13891387 if (((REST ) transport ).isProxyAuth ()) {
13901388 conn .setRequestProperty ("Proxy-Authorization" , "Basic " + ((REST ) transport ).getProxyCredentials ());
@@ -1429,7 +1427,7 @@ public BufferedImage getImage(String urlStr) throws FlickrException {
14291427 InputStream in = null ;
14301428 try {
14311429 URL url = new URL (urlStr );
1432- HttpURLConnection conn = (HttpURLConnection ) url .openConnection ();
1430+ HttpsURLConnection conn = (HttpsURLConnection ) url .openConnection ();
14331431 if (transport instanceof REST ) {
14341432 if (((REST ) transport ).isProxyAuth ()) {
14351433 conn .setRequestProperty ("Proxy-Authorization" , "Basic " + ((REST ) transport ).getProxyCredentials ());
0 commit comments