Merge lp:~ubuntuone-client-engineering/ubuntuone-music-java-library/update-stream-paths into lp:ubuntuone-music-java-library

[Michał Karnicki]

Update song stream path.

[Brian Curtin (brian.curtin)]

Looks ok to me.

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'src/main/com/ubuntuone/api/music/U1MusicAPI.java'
--- src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-09-28 02:04:22 +0000
+++ src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-11-08 16:27:03 +0000
@@ -85,7 +85,6 @@
 	public static final String PLAYLISTS = "playlists";
 
 	protected static final String RESOURCE_HOST = "one.ubuntu.com";
-	// TODO karni: Set this to proper streaming host when streaming handler is ready.
 	protected static final String STREAMING_HOST = "streaming.one.ubuntu.com";
 	
 	private final ResourceClient resourceClient;
 
=== modified file 'src/main/com/ubuntuone/api/music/client/StreamingClient.java'
--- src/main/com/ubuntuone/api/music/client/StreamingClient.java	2012-09-28 02:04:22 +0000
+++ src/main/com/ubuntuone/api/music/client/StreamingClient.java	2012-11-08 16:27:03 +0000
@@ -52,8 +52,7 @@
 	
 	@Override
 	public String getPath(String songId) {
-		// TODO karni: Set this to proper streaming path when streaming handler is ready.
-		return String.format("/stream/%s/", songId);
+		return String.format("%s/songs/%s", API_PATH, songId);
 	}
 
 	public HttpResponse download(String path, long offset,
 
=== modified file 'src/test/com/ubuntuone/api/music/GetSongStreamTest.java'
--- src/test/com/ubuntuone/api/music/GetSongStreamTest.java	2012-09-19 19:17:30 +0000
+++ src/test/com/ubuntuone/api/music/GetSongStreamTest.java	2012-11-08 16:27:03 +0000
@@ -106,7 +106,7 @@
 		final long offset = 0L;
 		
 		final HttpGet httpRequest =
-				new HttpGet("https://streaming.one.ubuntu.com/stream/" + song.getId() + "/");
+				new HttpGet("https://streaming.one.ubuntu.com/api/music/v2/songs/" + song.getId());
 		
 		String songContent = "song_content";
 		final InputStream instream = new ByteArrayInputStream(songContent.getBytes("UTF-8"));