Skip to content

Commit ca245c7

Browse files
author
boncey
committed
Update test payloads
1 parent f02c65a commit ca245c7

61 files changed

Lines changed: 3023 additions & 2814 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pom.xml‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<configuration>
7676
<mavenExecutorId>forked-path</mavenExecutorId>
7777
<useReleaseProfile>false</useReleaseProfile>
78+
<!--suppress UnresolvedMavenProperty -->
7879
<arguments>${arguments} -Psonatype-oss-release</arguments>
7980
</configuration>
8081
</plugin>
@@ -96,6 +97,7 @@
9697
<version>2.22.2</version>
9798
<configuration>
9899
<environmentVariables>
100+
<!--suppress UnresolvedMavenProperty -->
99101
<SETUP_PROPERTIES_PATH>${setupPropertiesPath}</SETUP_PROPERTIES_PATH>
100102
</environmentVariables>
101103
</configuration>
@@ -155,11 +157,10 @@
155157
<tag>HEAD</tag>
156158
</scm>
157159
<distributionManagement>
158-
<repository>
159-
<id>bintray-boncey-Flickr4Java-Flickr4Java</id>
160-
<name>boncey-Flickr4Java-Flickr4Java</name>
161-
<url>https://api.bintray.com/maven/boncey/Flickr4Java/Flickr4Java;publish=1</url>
162-
</repository>
160+
<snapshotRepository>
161+
<id>ossrh</id>
162+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
163+
</snapshotRepository>
163164
</distributionManagement>
164165
<profiles>
165166
<profile>
@@ -188,6 +189,17 @@
188189
</execution>
189190
</executions>
190191
</plugin>
192+
<plugin>
193+
<groupId>org.sonatype.plugins</groupId>
194+
<artifactId>nexus-staging-maven-plugin</artifactId>
195+
<version>1.6.7</version>
196+
<extensions>true</extensions>
197+
<configuration>
198+
<serverId>ossrh</serverId>
199+
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
200+
<autoReleaseAfterClose>true</autoReleaseAfterClose>
201+
</configuration>
202+
</plugin>
191203
</plugins>
192204
</build>
193205
</profile>

‎src/main/java/com/flickr4java/flickr/REST.java‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.flickr4java.flickr.util.UrlUtilities;
1111
import com.github.scribejava.core.model.OAuth1AccessToken;
1212
import com.github.scribejava.core.model.OAuthRequest;
13+
import com.github.scribejava.core.model.Parameter;
1314
import com.github.scribejava.core.model.Verb;
1415
import com.github.scribejava.core.oauth.OAuth10aService;
1516
import org.slf4j.Logger;
@@ -26,9 +27,13 @@
2627
import java.io.StringReader;
2728
import java.net.HttpURLConnection;
2829
import java.net.URL;
30+
import java.nio.file.Files;
31+
import java.nio.file.Path;
32+
import java.nio.file.Paths;
2933
import java.util.Base64;
3034
import java.util.HashMap;
3135
import java.util.Map;
36+
import java.util.Optional;
3237
import java.util.concurrent.ExecutionException;
3338

3439
/**
@@ -216,9 +221,9 @@ public com.flickr4java.flickr.Response postMultiPart(String path, UploadMetaData
216221
}
217222

218223
private OAuth10aService createAndSignRequest(String apiKey, String sharedSecret, OAuthRequest request) {
219-
OAuth10aService service = OAuthUtilities.createOAuthService(apiKey, sharedSecret, connectTimeoutMs, readTimeoutMs);
220-
OAuthUtilities.signRequest(service, request, proxyAuth ? getProxyCredentials() : null);
221-
return service;
224+
OAuth10aService service = OAuthUtilities.createOAuthService(apiKey, sharedSecret, connectTimeoutMs, readTimeoutMs);
225+
OAuthUtilities.signRequest(service, request, proxyAuth ? getProxyCredentials() : null);
226+
return service;
222227
}
223228

224229
private String buildUrl(String path) {
@@ -244,6 +249,9 @@ private Response handleResponse(OAuthRequest request, OAuth10aService service) t
244249
Response f4jResponse = (Response) responseClass.getConstructor().newInstance();
245250
f4jResponse.parse(document);
246251

252+
// Enable this method to update the test payloads
253+
// dumpResponseToFile(request, strXml);
254+
247255
return f4jResponse;
248256
}
249257

@@ -328,11 +336,25 @@ private DocumentBuilder getDocumentBuilder() throws ParserConfigurationException
328336
}
329337

330338
// Generate responses for offline tests
331-
// private void dumpResponseToFile(Object flickrMethod, String strXml, String httpMethod) throws IOException {
332-
// String filename = String.format("%s.xml", flickrMethod);
333-
// Path filePath = Paths.get("src/test/resources/payloads/" + httpMethod, filename);
334-
// Files.write(filePath, strXml.getBytes());
335-
// logger.info(String.format("Writing payload to file '%s'", filePath));
336-
// }
337339

340+
private void dumpResponseToFile(OAuthRequest request, String strXml) throws IOException {
341+
Verb verb = request.getVerb();
342+
Optional<String> flickrMethod = Optional.empty();
343+
switch (verb) {
344+
case GET:
345+
flickrMethod = request.getQueryStringParams().getParams().stream().filter(param -> param.getKey().equals("method")).findFirst().map(Parameter::getValue);
346+
break;
347+
case POST:
348+
flickrMethod = request.getBodyParams().getParams().stream().filter(param -> param.getKey().equals("method")).findFirst().map(Parameter::getValue);
349+
break;
350+
}
351+
if (flickrMethod.isPresent()) {
352+
String filename = String.format("%s.xml", flickrMethod.get());
353+
Path filePath = Paths.get("src/test/resources/payloads/" + verb, filename);
354+
Files.write(filePath, strXml.getBytes());
355+
logger.info(String.format("Writing payload to file '%s'", filePath));
356+
} else {
357+
logger.warn("Not dumping response to file as method not found in request for URL {}", request.getUrl());
358+
}
359+
}
338360
}

‎src/main/java/com/flickr4java/flickr/places/PlacesInterface.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
/**
2121
* Lookup Flickr Places.
2222
* <p>
23+
*
24+
* Note: As of May 2021 many of these methods no longer seem to work correctly in the Flickr API.
25+
* Confirmed via the https://www.flickr.com/services/api/ page.
2326
*
2427
* Announcement on places from yahoo:
2528
* <p>

‎src/main/java/com/flickr4java/flickr/tags/HotlistTag.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public HotlistTag() {
1515

1616
}
1717

18+
@Deprecated
19+
// Note that the API no longer returns the score
1820
public int getScore() {
1921
return score;
2022
}

‎src/main/java/com/flickr4java/flickr/tags/TagsInterface.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.util.Collection;
1818
import java.util.HashMap;
1919
import java.util.List;
20+
import java.util.Optional;
2021
import java.util.Map;
2122

2223
/**
@@ -171,16 +172,18 @@ public Collection<HotlistTag> getHotList(String period, int count) throws Flickr
171172
throw new FlickrException(response.getErrorCode(), response.getErrorMessage());
172173
}
173174

174-
Element tagsElement = response.getPayload();
175-
176-
List<HotlistTag> tags = new ArrayList<HotlistTag>();
177-
NodeList tagElements = tagsElement.getElementsByTagName("tag");
178-
for (int i = 0; i < tagElements.getLength(); i++) {
179-
Element tagElement = (Element) tagElements.item(i);
180-
HotlistTag tag = new HotlistTag();
181-
tag.setScore(tagElement.getAttribute("score"));
182-
tag.setValue(((Text) tagElement.getFirstChild()).getData());
183-
tags.add(tag);
175+
Collection<Element> payloadCollection = response.getPayloadCollection();
176+
Optional<Element> element = payloadCollection.stream().filter(payload -> payload.getTagName().equals("hottags")).findFirst();
177+
178+
List<HotlistTag> tags = new ArrayList<>();
179+
if (element.isPresent()) {
180+
NodeList tagElements = element.get().getElementsByTagName("tag");
181+
for (int i = 0; i < tagElements.getLength(); i++) {
182+
Element tagElement = (Element) tagElements.item(i);
183+
HotlistTag tag = new HotlistTag();
184+
tag.setValue(((Text) tagElement.getFirstChild()).getData());
185+
tags.add(tag);
186+
}
184187
}
185188
return tags;
186189
}

‎src/test/java/com/flickr4java/flickr/test/FavoritesInterfaceTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public void testGetPublicList() throws FlickrException {
4949

5050
@Test
5151
public void testAddAndRemove() throws FlickrException {
52-
String photoId = "2153378";
52+
String photoId = "51144759448"; // Photo that doesn't belong to the test user's account
5353
FavoritesInterface iface = flickr.getFavoritesInterface();
5454

5555
try {

‎src/test/java/com/flickr4java/flickr/test/InterestingnessInterfaceTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public void testGetListStringSetIntInt() throws FlickrException {
2828
assertNotNull(ii);
2929
PhotoList<Photo> list = ii.getList("2006-09-11", Extras.ALL_EXTRAS, 7, 9);
3030
assertNotNull(list);
31-
assertEquals(7, list.size());
32-
assertEquals(9, list.getPage());
33-
assertEquals(7, list.getPerPage());
34-
assertEquals(500, list.getTotal());
31+
assertTrue(list.size() >= 1);
32+
assertTrue(list.getPage() >= 1);
33+
assertTrue(list.getPerPage() >= 1);
34+
assertTrue(list.getTotal() >= 1);
3535
assertTrue(list.get(0) instanceof Photo);
3636
Photo photo = list.get(1);
3737
assertNotNull(photo.getId());

‎src/test/java/com/flickr4java/flickr/test/PlacesInterfaceTest.java‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.flickr4java.flickr.places.PlacesList;
1414
import com.flickr4java.flickr.tags.Tag;
1515

16+
import org.junit.Ignore;
1617
import org.junit.Test;
1718

1819
import java.util.ArrayList;
@@ -29,6 +30,8 @@ public class PlacesInterfaceTest extends Flickr4JavaTest {
2930
String sfWoeId = "2487956";
3031

3132
@Test
33+
@Ignore
34+
// This Flickr API method no longer seems to work correctly
3235
public void testFindByLonLat() throws FlickrException {
3336
PlacesInterface placesInterface = flickr.getPlacesInterface();
3437
PlacesList<Place> list = placesInterface.findByLatLon(52.524577D, 13.412247D, Flickr.ACCURACY_CITY);
@@ -41,6 +44,8 @@ public void testFindByLonLat() throws FlickrException {
4144
}
4245

4346
@Test
47+
@Ignore
48+
// This Flickr API method no longer seems to work correctly
4449
public void testFindAlabama() throws FlickrException {
4550
PlacesInterface placesInterface = flickr.getPlacesInterface();
4651
PlacesList<Place> list = placesInterface.find("Alabama");
@@ -52,6 +57,8 @@ public void testFindAlabama() throws FlickrException {
5257

5358
@SuppressWarnings("deprecation")
5459
@Test
60+
@Ignore
61+
// This Flickr API method no longer seems to work correctly
5562
public void testResolvePlaceId() throws FlickrException {
5663
PlacesInterface placesInterface = flickr.getPlacesInterface();
5764
Location location = placesInterface.resolvePlaceId("7.MJR8tTVrIO1EgB"); // SF
@@ -60,21 +67,24 @@ public void testResolvePlaceId() throws FlickrException {
6067

6168
@SuppressWarnings("deprecation")
6269
@Test
70+
@Ignore
71+
// This Flickr API method no longer seems to work correctly
6372
public void testResolvePlaceUrl() throws FlickrException {
6473
PlacesInterface placesInterface = flickr.getPlacesInterface();
6574
Location location = placesInterface.resolvePlaceURL("/United+States/California/San+Francisco");
6675
placeAssertions(location);
6776
}
6877

6978
@Test
79+
@Ignore
80+
// This Flickr API method no longer seems to work correctly
7081
public void testGetChildrenWithPhotosPublic() throws FlickrException {
7182
PlacesInterface placesInterface = flickr.getPlacesInterface();
7283
String woeId = "2487956";
7384
String placeId = "kH8dLOubBZRvX_YZ";
7485
PlacesList<Place> list = placesInterface.getChildrenWithPhotosPublic(placeId, woeId);
7586
boolean presidioFound = false;
76-
for (int i = 0; i < list.size(); i++) {
77-
Place place = list.get(i);
87+
for (Place place : list) {
7888
// System.out.println(place.getName());
7989
if (place.getPlaceId().equals("7bgsk3lTWrhSWp2fUQ")) {
8090
assertEquals("Fisherman's Wharf, San Francisco, CA, US, United States", place.getName());
@@ -91,12 +101,12 @@ public void testGetInfo() throws FlickrException {
91101
String woeId = "2487956";
92102
String placeId = "7.MJR8tTVrIO1EgB";
93103
Location loc = placesInterface.getInfo(woeId, null);
94-
assertEquals("/United+States/California/San+Francisco", loc.getPlaceUrl());
95-
loc = placesInterface.getInfo(null, placeId);
96-
assertEquals("/United+States/California/San+Francisco", loc.getPlaceUrl());
104+
assertEquals("San Francisco,", loc.getName());
97105
}
98106

99107
@Test
108+
@Ignore
109+
// This Flickr API method no longer seems to work correctly
100110
public void testGetInfoByUrl() throws FlickrException {
101111
PlacesInterface placesInterface = flickr.getPlacesInterface();
102112
String placeId = "7.MJR8tTVrIO1EgB";
@@ -134,6 +144,8 @@ public void testGetTopPlacesList() throws FlickrException {
134144
}
135145

136146
@Test
147+
@Ignore
148+
// This Flickr API method no longer seems to work correctly
137149
public void testPlacesForBoundingBox() throws FlickrException {
138150
PlacesInterface placesInterface = flickr.getPlacesInterface();
139151
String bbox = "-122.42307100000001,37.773779,-122.381071,37.815779";
@@ -148,6 +160,8 @@ public void testPlacesForBoundingBox() throws FlickrException {
148160
}
149161

150162
@Test
163+
@Ignore
164+
// This Flickr API method no longer seems to work correctly
151165
public void testPlacesForContacts() throws FlickrException {
152166
PlacesInterface placesInterface = flickr.getPlacesInterface();
153167
int placeType = Place.TYPE_REGION;
@@ -165,6 +179,8 @@ public void testPlacesForContacts() throws FlickrException {
165179
}
166180

167181
@Test
182+
@Ignore
183+
// This Flickr API method no longer seems to work correctly
168184
public void testPlacesForTags() throws FlickrException {
169185
PlacesInterface placesInterface = flickr.getPlacesInterface();
170186
int placeTypeId = Place.TYPE_REGION;
@@ -190,6 +206,8 @@ public void testPlacesForTags() throws FlickrException {
190206
}
191207

192208
@Test
209+
@Ignore
210+
// This Flickr API method no longer seems to work correctly
193211
public void testPlacesForUser() throws FlickrException {
194212
PlacesInterface placesInterface = flickr.getPlacesInterface();
195213
int placeType = Place.TYPE_REGION;

‎src/test/resources/payloads/get/flickr.activity.userComments.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<rsp stat="ok">
33
<items page="1" pages="1" perpage="10" total="1">
4-
<item type="photo" id="6551229785" owner="92023420@N00" ownername="boncey" realname="Darren Greaves" iconserver="5442" iconfarm="6" secret="09e9969ed9" server="7007" farm="8" media="photo" comments="1" notes="0" views="636" faves="0">
4+
<item type="photo" id="6551229785" owner="92023420@N00" ownername="boncey" realname="Darren Greaves" iconserver="5442" iconfarm="6" secret="09e9969ed9" server="7007" farm="8" media="photo" comments="1" notes="0" views="746" faves="0">
55
<title>Cheddar</title>
66
<activity>
77
<event type="comment" user="24573443@N04" username="boncey_test" iconserver="7008" iconfarm="8" dateadded="1328131942" is_muted="" realname="Darren Greaves" commentid="72157629134118271">Test comment.</event>

‎src/test/resources/payloads/get/flickr.activity.userPhotos.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<rsp stat="ok">
33
<items page="1" pages="1" perpage="10" total="2">
4-
<item type="photo" id="28177658657" owner="24573443@N04" ownername="boncey_test" realname="Darren Greaves" iconserver="7008" iconfarm="8" secret="6de6c517b0" server="913" farm="1" media="video" comments="0" notes="0" views="1" faves="0">
4+
<item type="photo" id="28177658657" owner="24573443@N04" ownername="boncey_test" realname="Darren Greaves" iconserver="7008" iconfarm="8" secret="6de6c517b0" server="913" farm="1" media="video" comments="0" notes="0" views="5" faves="0">
55
<title>2014-05-04 13.56.00</title>
66
<activity>
77
<event type="tag" user="92023420@N00" username="boncey" iconserver="5442" iconfarm="6" dateadded="1530119216" is_muted="" realname="Darren Greaves">london</event>
88
</activity>
99
</item>
10-
<item type="photo" id="5628095432" owner="24573443@N04" ownername="boncey_test" realname="Darren Greaves" iconserver="7008" iconfarm="8" secret="678f9b91c1" server="5150" farm="6" media="photo" comments="1" notes="0" views="64" faves="2">
10+
<item type="photo" id="5628095432" owner="24573443@N04" ownername="boncey_test" realname="Darren Greaves" iconserver="7008" iconfarm="8" secret="678f9b91c1" server="5150" farm="6" media="photo" comments="1" notes="0" views="86" faves="2">
1111
<title>Robot</title>
1212
<activity>
1313
<event type="comment" user="92023420@N00" username="boncey" iconserver="5442" iconfarm="6" dateadded="1328212836" is_muted="" realname="Darren Greaves" commentid="72157629147135805">This looks familiar</event>

0 commit comments

Comments
 (0)