Merge lp:~karni/ubuntuone-music-java-library/v2-changes-and-playlists into lp:ubuntuone-music-java-library

[Michał Karnicki]

Introduced music API v2 changes. Added creating and updating playlists.

Introduced minor music API v2 changes (new fields in JSON response).
Added creating and updating playlists.
Renamed a few variables.

=== modified file 'src/main/com/ubuntuone/api/music/U1MusicAPI.java'
--- src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/U1MusicAPI.java	2012-11-12 15:33:23 +0000
@@ -28,6 +28,7 @@
 import java.io.OutputStream;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -42,6 +43,7 @@
 import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.codehaus.jackson.JsonParseException;
 
 import com.ubuntuone.api.music.client.BaseClient;
@@ -53,7 +55,9 @@
 import com.ubuntuone.api.music.json.U1CustomJson;
 import com.ubuntuone.api.music.json.U1PlaylistJson;
 import com.ubuntuone.api.music.json.U1SongJson;
+import com.ubuntuone.api.music.request.U1CallbackListener;
 import com.ubuntuone.api.music.request.U1DownloadListener;
+import com.ubuntuone.api.music.request.U1PlaylistCreateListener;
 import com.ubuntuone.api.music.util.CancelTrigger;
 import com.ubuntuone.api.music.util.CancelTrigger.RequestCanceledException;
 import com.ubuntuone.api.music.util.EntityUtils;
@@ -65,6 +69,7 @@
 import com.ubuntuone.api.music.util.ResultRequestListener.U1AlbumRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1ArtRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1ArtistRequestListener;
+import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistCreateRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1SongRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1StreamRequestListener;
@@ -381,32 +386,28 @@
 		}
 	}
 	
-	public void createPlaylist(String name,
-			ArrayList<String> songIds, U1SongRequestListener callback) {
-		putPlaylist(null, name, songIds, callback);
-	}
-	
-	public void updatePlaylist(String playlistId, String name,
-			ArrayList<String> songIds, U1SongRequestListener callback) {
-		putPlaylist(playlistId, name, songIds, callback);
-	}
-	
-	public void putPlaylist(String playlistId, String name, ArrayList<String> songIds,
-			U1SongRequestListener callback) {
+	/**
+	 * Creates a new playlist.
+	 * 
+	 * @param name
+	 *            The name of the playlist to be created.
+	 * @param songIdList
+	 *            The song id list of the new playlist. Can be null.
+	 * @param callback
+	 *            {@link U1PlaylistCreateRequestListener} result callback. Use
+	 *            {@link U1PlaylistCreateListener} class for convenience.
+	 */
+	public void createPlaylist(String name, List<String> songIdList,
+			U1PlaylistCreateRequestListener callback) {
 		callback.onStart();
-		String path;
-		if (playlistId != null) {
-			path = resourceClient.getPath(PLAYLISTS, playlistId);
-		} else {
-			path = resourceClient.getPath(PLAYLISTS);
-		}
+		String path = resourceClient.getPath(PLAYLISTS);
 		HttpResponse response = null;
 		try {
-			String data = U1CustomJson.toPlaylistJson(name, songIds);
+			String data = U1CustomJson.toPlaylistJson(name, songIdList);
 			response = resourceClient.request(HttpPost.METHOD_NAME, path, null, data);
 			final int statusCode = getStatusCode(response);
-			if (statusCode == HttpStatus.SC_OK) {
-				U1SongJson.fromJson(getContentInputStream(response), callback);
+			if (statusCode == HttpStatus.SC_CREATED) {
+				U1PlaylistJson.fromPlaylistCreateResponse(getContentInputStream(response), callback);
 			} else {
 				handleHttpResponse(response, "Could not create playlist.", callback);
 			}
@@ -436,6 +437,72 @@
 		}
 	}
 	
+	/**
+	 * Updates a playlist. One of name or songIdList is required.
+	 * 
+	 * @param playlistId
+	 *            The playlist id of the playlist to be updated.
+	 * @param name
+	 *            New playlist name. Optional if songIdList provided.
+	 * @param songIdList
+	 *            New playlist content. Optional if name provided.
+	 * @param callback
+	 *            {@link U1RequestListener} result callback. Use
+	 *            {@link U1CallbackListener} class for convenience.
+	 */
+	public void updatePlaylist(String playlistId, String name,
+			ArrayList<String> songIdList, U1RequestListener callback) {
+		if (playlistId == null) {
+			throw new IllegalArgumentException("null playlistId passed to updatePlaylist");
+		}
+		
+		callback.onStart();
+		String path = resourceClient.getPath(PLAYLISTS, playlistId);
+		HttpResponse response = null;
+		try {
+			String data = U1CustomJson.toPlaylistJson(name, songIdList);
+			response = resourceClient.request(HttpPut.METHOD_NAME, path, null, data);
+			final int statusCode = getStatusCode(response);
+			if (statusCode == HttpStatus.SC_OK) {
+				callback.onSuccess();
+			} else {
+				handleHttpResponse(response, "Could not update playlist.", callback);
+			}
+		} catch (JsonParseException jpe) {
+			// Received corrupt JSON. At this stage, response != null
+			final String bzrRev = getHeaderValue(ResponseHeader.X_BZR_REVISION_NUMBER, response);
+			final String date = getHeaderValue(ResponseHeader.DATE, response);
+			
+			callback.onFailure(new Failure("Could not update playlist. Corrupt JSON.",
+					jpe, 0, null, bzrRev, date));
+		}  catch (OutOfMemoryError e) {
+			callback.onFailure(new Failure("Out of memory!", e));
+			throw e; // We're not expected to recover from this.
+		} catch (SSLException sslException) {
+			callback.onFailure(new Failure("SSL connection problem. This may be intermittent issue, " +
+					"please try again later.", sslException));
+		} catch (IOException ioException) {
+			// Failed to read the response.
+			callback.onFailure(new Failure("Could not update playlist (network error).", ioException));
+		} catch (URISyntaxException uriSyntaxException) {
+			// Failed due to invalid URL within the library code.
+			throw new IllegalStateException(uriSyntaxException);
+		} catch (AuthorizerException signingException) {
+			callback.onFailure(new Failure("Could not update playlist (signing exception).", signingException));
+		} finally {
+			callback.onFinish();
+		}
+	}
+	
+	/**
+	 * Deletes a playlist.
+	 * 
+	 * @param playlistId
+	 *            The playlist id of the playlist to be deleted.
+	 * @param callback
+	 *            {@link U1RequestListener} result callback. Use
+	 *            {@link U1CallbackListener} class for convenience.
+	 */
 	public void deletePlaylist(String playlistId, U1RequestListener callback) {
 		callback.onStart();
 		String path = resourceClient.getPath(PLAYLISTS, playlistId);

=== modified file 'src/main/com/ubuntuone/api/music/client/ResourceClient.java'
--- src/main/com/ubuntuone/api/music/client/ResourceClient.java	2012-09-28 02:04:22 +0000
+++ src/main/com/ubuntuone/api/music/client/ResourceClient.java	2012-11-12 15:33:23 +0000
@@ -85,7 +85,7 @@
 			throws IOException, SSLException, URISyntaxException, AuthorizerException {
 		final HttpClient httpClient = getHttpClient();
 		String query = null;
-		if (params != null) {
+		if (params != null && HttpPut.METHOD_NAME.equals(method)) {
 			query = URLEncodedUtils.format(params, UTF8);
 		}
 		final URI uri = new URI(getHost().getSchemeName(), getHost().getHostName(), path, query, null);

=== modified file 'src/main/com/ubuntuone/api/music/json/U1AlbumJson.java'
--- src/main/com/ubuntuone/api/music/json/U1AlbumJson.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/json/U1AlbumJson.java	2012-11-12 15:33:23 +0000
@@ -49,6 +49,7 @@
 		g.writeStringField("id", album.getId());
 		g.writeStringField("album_url", album.getAlbumUrl());
 		g.writeStringField("artist", album.getArtist());
+		g.writeStringField("artist_id", album.getArtistId());
 		g.writeStringField("title", album.getTitle());
 		g.writeNumberField("parsed_date", album.getParsedDate());
 		g.writeStringField("album_art_url", album.getAlbumArtUrl());
@@ -72,6 +73,7 @@
 			String id = null;
 			String albumUrl = null;
 			String artist = null;
+			String artistId = null;
 			String title = null;
 			Long parsedDate = null;
 			String albumArtUrl = null;
@@ -91,6 +93,8 @@
 					albumUrl = jp.getText();
 				} else if ("artist".equals(field)) {
 					artist = jp.getText();
+				} else if ("artist_id".equals(field)) {
+					artistId = jp.getText();
 				} else if ("title".equals(field)) {
 					title = jp.getText();
 				} else if ("parsed_date".equals(field)) {
@@ -114,8 +118,8 @@
 				}
 			}
 			
-			U1Album album = new U1Album(id, albumUrl, artist, title, parsedDate,
-					albumArtUrl, year);
+			U1Album album = new U1Album(id, albumUrl, artist, artistId, title,
+					parsedDate, albumArtUrl, year);
 			
 			callback.onSuccess(album);
 		}

=== modified file 'src/main/com/ubuntuone/api/music/json/U1ArtistJson.java'
--- src/main/com/ubuntuone/api/music/json/U1ArtistJson.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/json/U1ArtistJson.java	2012-11-12 15:33:23 +0000
@@ -51,8 +51,8 @@
 		g.writeStringField("artist_url", artist.getArtistUrl());
 		g.writeStringField("artist", artist.getArtist());
 		g.writeStringField("artist_art_url", artist.getArtistArtUrl());
-		g.writeArrayFieldStart("album_list");
-		ArrayList<String> albumList = artist.getAlbumList();
+		g.writeArrayFieldStart("album_ids");
+		ArrayList<String> albumList = artist.getAlbumIds();
 		for (String albumId : albumList) {
 			g.writeString(albumId);
 		}
@@ -97,7 +97,7 @@
 					artist = jp.getText();
 				} else if ("artist_art_url".equals(field)) {
 					artistArtUrl = jp.getText();
-				} else if ("album_list".equals(field)) {
+				} else if ("album_ids".equals(field)) {
 					albumList = new ArrayList<String>();
 					while (JsonToken.END_ARRAY != jp.nextToken()) {
 						String albumId = jp.getText();

=== modified file 'src/main/com/ubuntuone/api/music/json/U1CustomJson.java'
--- src/main/com/ubuntuone/api/music/json/U1CustomJson.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/json/U1CustomJson.java	2012-11-12 15:33:23 +0000
@@ -23,7 +23,7 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
+import java.util.List;
 
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -42,8 +42,8 @@
 	 * @throws IOException
 	 *             If JSON generation fails with IOException.
 	 */
-	public static String toPlaylistJson(String name,
-			ArrayList<String> songIdList) throws IOException {
+	public static String toPlaylistJson(String name, List<String> songIdList)
+			throws IOException {
 		final JsonFactory factory = new JsonFactory();
 		final StringWriter writer = new StringWriter(128);
 		final JsonGenerator g = factory.createJsonGenerator(writer);

=== modified file 'src/main/com/ubuntuone/api/music/json/U1PlaylistJson.java'
--- src/main/com/ubuntuone/api/music/json/U1PlaylistJson.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/json/U1PlaylistJson.java	2012-11-12 15:33:23 +0000
@@ -35,6 +35,7 @@
 
 import com.ubuntuone.api.music.U1MusicAPI;
 import com.ubuntuone.api.music.model.U1Playlist;
+import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistCreateRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistRequestListener;
 
 public class U1PlaylistJson
@@ -106,4 +107,25 @@
 		}
 		jp.close();
 	}
+	
+	public static void fromPlaylistCreateResponse(InputStream stream,
+			U1PlaylistCreateRequestListener callback) throws JsonParseException,
+			IOException {
+		final JsonFactory factory = new JsonFactory();
+		final JsonParser jp = factory.createJsonParser(stream);
+		
+		U1MetaJsonPreprocessor.getResponseMeta(jp);
+		jp.nextToken(); // playlist id
+		jp.nextValue();
+		
+		final String field = jp.getCurrentName();
+		if ("id".equals(field)) {
+			String id = jp.getText();
+			callback.onSuccess(id);
+		} else {
+			logger.warning("Unexpected JSON field: " + field);
+		}
+		
+		jp.close();
+	}
 }

=== modified file 'src/main/com/ubuntuone/api/music/json/U1SongJson.java'
--- src/main/com/ubuntuone/api/music/json/U1SongJson.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/json/U1SongJson.java	2012-11-12 15:33:23 +0000
@@ -60,6 +60,7 @@
 		g.writeNumberField("size", song.getSize());
 		g.writeNumberField("bit_rate", song.getBitRate());
 		g.writeStringField("artist", song.getArtist());
+		g.writeStringField("artist_id", song.getArtistId());
 		g.writeStringField("title", song.getTitle());
 		g.writeStringField("suffix", song.getSuffix());
 		g.writeStringField("content_type", song.getContentType());
@@ -100,6 +101,7 @@
 			Integer size = null;
 			Integer bitRate = null;
 			String artist = null;
+			String artistId = null;
 			String title = null;
 			String suffix = null;
 			String contentType = null;
@@ -122,6 +124,9 @@
 					albumId = jp.getText();
 				} else if ("album_artist".equals(field)) {
 					albumArtist = jp.getText();
+				} else if ("album_artist_id".equals(field)) {
+					// Ignore.
+					continue;
 				} else if ("album".equals(field)) {
 					album = jp.getText();
 				} else if ("song_art_url".equals(field)) {
@@ -166,6 +171,8 @@
 					}
 				} else if ("artist".equals(field)) {
 					artist = jp.getText();
+				} else if ("artist_id".equals(field)) {
+					artistId = jp.getText();
 				} else if ("title".equals(field)) {
 					title = jp.getText();
 				} else if ("suffix".equals(field)) {
@@ -185,7 +192,8 @@
 			
 			U1Song song = new U1Song(id, songUrl, albumId, albumArtist, album,
 					songArtUrl, genre, year, discNumber, track, duration, size,
-					bitRate, artist, title, suffix, contentType, songStreamUrl, path);
+					bitRate, artist, artistId, title, suffix, contentType,
+					songStreamUrl, path);
 			
 			callback.onSuccess(song);
 		}

=== modified file 'src/main/com/ubuntuone/api/music/model/U1Album.java'
--- src/main/com/ubuntuone/api/music/model/U1Album.java	2012-09-04 20:27:21 +0000
+++ src/main/com/ubuntuone/api/music/model/U1Album.java	2012-11-12 15:33:23 +0000
@@ -42,6 +42,8 @@
 	
 	/** Album artist. */
 	private final String artist;
+	/** Album artist id. */
+	private final String artistId;
 	/** Album title. */
 	private final String title;
 	/** Timestamp when the album was parsed. */

=== modified file 'src/main/com/ubuntuone/api/music/model/U1Artist.java'
--- src/main/com/ubuntuone/api/music/model/U1Artist.java	2012-09-04 19:28:22 +0000
+++ src/main/com/ubuntuone/api/music/model/U1Artist.java	2012-11-12 15:33:23 +0000
@@ -46,7 +46,7 @@
 	/** Artist art URL. */
 	private final String artistArtUrl;
 	/** Artist album id list. */
-	private final ArrayList<String> albumList;
+	private final ArrayList<String> albumIds;
 	/** Artist total song count. */
 	private final Integer songCount;
 	

=== modified file 'src/main/com/ubuntuone/api/music/model/U1Song.java'
--- src/main/com/ubuntuone/api/music/model/U1Song.java	2012-08-27 17:20:36 +0000
+++ src/main/com/ubuntuone/api/music/model/U1Song.java	2012-11-12 15:33:23 +0000
@@ -65,6 +65,8 @@
 	private final Integer bitRate;
 	/** Track artist. */
 	private final String artist;
+	/** Track artist id. */
+	private final String artistId;
 	/** Track title. */
 	private final String title;
 	

=== added file 'src/main/com/ubuntuone/api/music/request/U1PlaylistCreateListener.java'
--- src/main/com/ubuntuone/api/music/request/U1PlaylistCreateListener.java	1970-01-01 00:00:00 +0000
+++ src/main/com/ubuntuone/api/music/request/U1PlaylistCreateListener.java	2012-11-12 15:33:23 +0000
@@ -0,0 +1,44 @@
+/*
+ * Ubuntu One Music Java library - communicate with Ubuntu One music API
+ * 
+ * Copyright 2012 Canonical Ltd.
+ *   
+ * This file is part of Ubuntu One Files Java library.
+ *  
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *  
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *  
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see http://www.gnu.org/licenses 
+ */
+
+package com.ubuntuone.api.music.request;
+
+import com.ubuntuone.api.music.client.Failure;
+import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistCreateRequestListener;
+
+public abstract class U1PlaylistCreateListener
+		implements U1PlaylistCreateRequestListener
+{
+	@Override
+	public void onStart() {
+	}
+
+	@Override
+	public abstract void onSuccess(String playlistId);
+
+	@Override
+	public void onFailure(Failure failure) {
+	}
+
+	@Override
+	public void onFinish() {
+	}
+}

=== modified file 'src/main/com/ubuntuone/api/music/util/ResultRequestListener.java'
--- src/main/com/ubuntuone/api/music/util/ResultRequestListener.java	2012-11-12 15:33:22 +0000
+++ src/main/com/ubuntuone/api/music/util/ResultRequestListener.java	2012-11-12 15:33:23 +0000
@@ -60,7 +60,7 @@
 	public interface U1SongRequestListener extends ResultRequestListener<U1Song> {};
 	
 	public interface U1PlaylistRequestListener extends ResultRequestListener<U1Playlist> {};
-	public interface U1PlaylistSongRequestListener extends ResultRequestListener<U1Song> {};
+	public interface U1PlaylistCreateRequestListener extends ResultRequestListener<String> {};
 	
 	public interface U1ArtRequestListener extends ResultRequestListener<File> {};
 	public interface U1StreamRequestListener extends ResultRequestListener<InputStream> {};

=== modified file 'src/test/com/ubuntuone/api/music/CreatePlaylistTest.java'
--- src/test/com/ubuntuone/api/music/CreatePlaylistTest.java	2012-11-12 15:33:22 +0000
+++ src/test/com/ubuntuone/api/music/CreatePlaylistTest.java	2012-11-12 15:33:23 +0000
@@ -22,6 +22,7 @@
 package com.ubuntuone.api.music;
 
 import static com.ubuntuone.test.util.SameHttpRequestMatcher.sameRequest;
+import static com.ubuntuone.test.util.SameStatusCodeFailureMatcher.sameStatusCodeFailure;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -47,10 +48,8 @@
 import com.ubuntuone.api.music.client.Failure;
 import com.ubuntuone.api.music.json.U1CustomJson;
 import com.ubuntuone.api.music.model.U1Meta;
-import com.ubuntuone.api.music.model.U1Song;
-import com.ubuntuone.api.music.util.ResultRequestListener.U1SongRequestListener;
+import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistCreateRequestListener;
 import com.ubuntuone.music.util.U1ResponseBuilder;
-import com.ubuntuone.music.util.U1SongBuilder;
 import com.ubuntuone.music.util.Util;
 import com.ubuntuone.test.util.DummyAuthorizer;
 
@@ -67,18 +66,18 @@
 	private HttpClient httpClient;
 	private U1MusicAPI musicApi;
 	
-	private U1SongRequestListener songCallback;
+	private U1PlaylistCreateRequestListener callback;
 	
 	@Before
 	public void setUp() throws IOException {
 		Logger.getLogger(U1MusicAPI.LOGGER_NAME).setLevel(Level.OFF);
 		
-		httpResponse = Util.buildResponse(HttpStatus.SC_OK);
+		httpResponse = Util.buildResponse(HttpStatus.SC_CREATED);
 				
 		httpClient = context.mock(HttpClient.class);
 		musicApi = new U1MusicAPI("ua/1.0", httpClient, new DummyAuthorizer());
 		
-		songCallback = context.mock(U1SongRequestListener.class);
+		callback = context.mock(U1PlaylistCreateRequestListener.class);
 	}
 	
 	@Test
@@ -88,123 +87,79 @@
 		
 		final Sequence requestSequence = context.sequence("lifecycle");
 		context.checking(new Expectations() {{
-			oneOf(songCallback).onStart();
+			oneOf(callback).onStart();
 					inSequence(requestSequence);
 			
 			ignoring(httpClient);
-			allowing(songCallback).onSuccess(with(any(U1Song.class)));
-			allowing(songCallback).onFailure(with(any(Failure.class)));
+			allowing(callback).onSuccess(with(any(String.class)));
+			allowing(callback).onFailure(with(any(Failure.class)));
 			
-			oneOf(songCallback).onFinish();
+			oneOf(callback).onFinish();
 					inSequence(requestSequence);
 		}});
 		
-		musicApi.createPlaylist(name, songIdList, songCallback);
+		musicApi.createPlaylist(name, songIdList, callback);
 	}
 	
 	@Test
 	public void testCreatePlaylist() throws IOException {
-		final U1Meta meta = new U1Meta();
-		String id = "playlistId";
 		String name = "playlist name";
 		ArrayList<String> songIdList = new ArrayList<String>();
-		
-		final U1Song song1 = new U1SongBuilder()
-				.withId("songId1").withAlbumId("Song album 1").build();
-		songIdList.add(song1.getId());
-		
-		final U1Song song2 = new U1SongBuilder()
-				.withId("songId2").withAlbumId("Song album 2").build();
-		songIdList.add(song2.getId());
-		
-		final U1Song song3 = new U1SongBuilder()
-				.withId("songId3").withAlbumId("Song album 3").build();
-		songIdList.add(song3.getId());
-		
+		final U1Meta meta = new U1Meta();
+		final String playlistId = "playlistId";
+
 		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
 				"/api/music/v2/playlists/");
-		
 		httpRequest.setEntity(new StringEntity(U1CustomJson
 				.toPlaylistJson(name, songIdList)));
 		
-		String responseJson = U1ResponseBuilder.toJson(
-				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
-		
+		String responseJson = U1ResponseBuilder.toPlaylistCreatedJson(meta, playlistId);
 		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
 		
 		final Sequence requestSequence = context.sequence("lifecycle");
 		context.checking(new Expectations() {{
-			oneOf(songCallback).onStart();
+			oneOf(callback).onStart();
 					inSequence(requestSequence);
 					
 			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
 					inSequence(requestSequence);
 							will(returnValue(httpResponse));
-			
-			oneOf(songCallback).onSuccess(with(song1));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song2));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song3));
-					inSequence(requestSequence);
-			
-			oneOf(songCallback).onFinish();
+							
+			oneOf(callback).onSuccess(playlistId);
+					inSequence(requestSequence);
+			
+			oneOf(callback).onFinish();
 					inSequence(requestSequence);
 		}});
 		
-		musicApi.createPlaylist(name, songIdList, songCallback);
+		musicApi.createPlaylist(name, songIdList, callback);
 	}
 	
 	@Test
-	public void testUpdatePlaylist() throws IOException {
-		final U1Meta meta = new U1Meta();
-		String id = "playlistId";
-		String name = "playlist name";
-		ArrayList<String> songIdList = new ArrayList<String>();
-		
-		final U1Song song1 = new U1SongBuilder()
-				.withId("songId1").withAlbumId("Song album 1").build();
-		songIdList.add(song1.getId());
-		
-		final U1Song song2 = new U1SongBuilder()
-				.withId("songId2").withAlbumId("Song album 2").build();
-		songIdList.add(song2.getId());
-		
-		final U1Song song3 = new U1SongBuilder()
-				.withId("songId3").withAlbumId("Song album 3").build();
-		songIdList.add(song3.getId());
-		
+	public void testNoArgCreatePlaylistFailure() throws IOException {
 		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
 				"/api/music/v2/playlists/");
-		
-		httpRequest.setEntity(new StringEntity(U1CustomJson
-				.toPlaylistJson(name, songIdList)));
-		
-		String responseJson = U1ResponseBuilder.toJson(
-				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
-		
-		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		httpRequest.setEntity(
+				new StringEntity(U1CustomJson.toPlaylistJson(null, null)));
+		
+		httpResponse = Util.buildResponse(HttpStatus.SC_FORBIDDEN);
 		
 		final Sequence requestSequence = context.sequence("lifecycle");
 		context.checking(new Expectations() {{
-			oneOf(songCallback).onStart();
+			oneOf(callback).onStart();
 					inSequence(requestSequence);
 					
 			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
 					inSequence(requestSequence);
 							will(returnValue(httpResponse));
 			
-			oneOf(songCallback).onSuccess(with(song1));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song2));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song3));
-					inSequence(requestSequence);
-			
-			oneOf(songCallback).onFinish();
+			oneOf(callback).onFailure(with(sameStatusCodeFailure(
+					new Failure("", HttpStatus.SC_FORBIDDEN))));
+							
+			oneOf(callback).onFinish();
 					inSequence(requestSequence);
 		}});
 		
-		musicApi.createPlaylist(name, songIdList, songCallback);
+		musicApi.createPlaylist(null, null, callback);
 	}
 }

=== modified file 'src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java'
--- src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java	2012-11-12 15:33:22 +0000
+++ src/test/com/ubuntuone/api/music/UpdatePlaylistTest.java	2012-11-12 15:33:23 +0000
@@ -22,6 +22,7 @@
 package com.ubuntuone.api.music;
 
 import static com.ubuntuone.test.util.SameHttpRequestMatcher.sameRequest;
+import static com.ubuntuone.test.util.SameStatusCodeFailureMatcher.sameStatusCodeFailure;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -32,7 +33,7 @@
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
 import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.StringEntity;
 import org.jmock.Expectations;
 import org.jmock.Mockery;
@@ -48,7 +49,7 @@
 import com.ubuntuone.api.music.json.U1CustomJson;
 import com.ubuntuone.api.music.model.U1Meta;
 import com.ubuntuone.api.music.model.U1Song;
-import com.ubuntuone.api.music.util.ResultRequestListener.U1SongRequestListener;
+import com.ubuntuone.api.music.util.RequestListener.U1RequestListener;
 import com.ubuntuone.music.util.U1ResponseBuilder;
 import com.ubuntuone.music.util.U1SongBuilder;
 import com.ubuntuone.music.util.Util;
@@ -67,7 +68,7 @@
 	private HttpClient httpClient;
 	private U1MusicAPI musicApi;
 	
-	private U1SongRequestListener songCallback;
+	private U1RequestListener callback;
 	
 	@Before
 	public void setUp() throws IOException {
@@ -78,34 +79,35 @@
 		httpClient = context.mock(HttpClient.class);
 		musicApi = new U1MusicAPI("ua/1.0", httpClient, new DummyAuthorizer());
 		
-		songCallback = context.mock(U1SongRequestListener.class);
+		callback = context.mock(U1RequestListener.class);
 	}
 	
 	@Test
-	public void testCreatePlaylistLifeCycleCallbacks() {
+	public void testUpdatePlaylistLifeCycleCallbacks() {
+		String playlistId = "playlist-id";
 		String name = "playlist name";
 		ArrayList<String> songIdList = new ArrayList<String>();
 		
 		final Sequence requestSequence = context.sequence("lifecycle");
 		context.checking(new Expectations() {{
-			oneOf(songCallback).onStart();
+			oneOf(callback).onStart();
 					inSequence(requestSequence);
 			
 			ignoring(httpClient);
-			allowing(songCallback).onSuccess(with(any(U1Song.class)));
-			allowing(songCallback).onFailure(with(any(Failure.class)));
+			allowing(callback).onSuccess();
+			allowing(callback).onFailure(with(any(Failure.class)));
 			
-			oneOf(songCallback).onFinish();
+			oneOf(callback).onFinish();
 					inSequence(requestSequence);
 		}});
 		
-		musicApi.createPlaylist(name, songIdList, songCallback);
+		musicApi.updatePlaylist(playlistId, name, songIdList, callback);
 	}
 	
 	@Test
-	public void testCreatePlaylist() throws IOException {
+	public void testUpdatePlaylist() throws IOException {
 		final U1Meta meta = new U1Meta();
-		String id = "playlistId";
+		String playlistId = "playlist-id";
 		String name = "playlist name";
 		ArrayList<String> songList = new ArrayList<String>();
 		
@@ -121,37 +123,67 @@
 				.withId("songId3").withAlbumId("Song album 3").build();
 		songList.add(song3.getId());
 		
-		final HttpPost httpRequest = new HttpPost("https://one.ubuntu.com" +
-				"/api/music/v2/playlists/");
-		
-		httpRequest.setEntity(new StringEntity(U1CustomJson
-				.toPlaylistJson(name, songList)));
-		
-		String responseJson = U1ResponseBuilder.toJson(
-				meta, U1MusicAPI.SONGS, id, name, song1, song2, song3);
-		
-		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
-		
-		final Sequence requestSequence = context.sequence("lifecycle");
-		context.checking(new Expectations() {{
-			oneOf(songCallback).onStart();
-					inSequence(requestSequence);
-					
-			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
-					inSequence(requestSequence);
-							will(returnValue(httpResponse));
-			
-			oneOf(songCallback).onSuccess(with(song1));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song2));
-					inSequence(requestSequence);
-			oneOf(songCallback).onSuccess(with(song3));
-					inSequence(requestSequence);
-			
-			oneOf(songCallback).onFinish();
-					inSequence(requestSequence);
-		}});
-		
-		musicApi.createPlaylist(name, songList, songCallback);
+		final HttpPut httpRequest = new HttpPut("https://one.ubuntu.com" +
+				"/api/music/v2/playlists/" + playlistId + "/");
+		
+		httpRequest.setEntity(new StringEntity(U1CustomJson
+				.toPlaylistJson(name, songList)));
+		
+		String responseJson = U1ResponseBuilder.toPlaylistUpdatedJSON(meta);
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(callback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(callback).onSuccess();
+					inSequence(requestSequence);
+			
+			oneOf(callback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.updatePlaylist(playlistId, name, songList, callback);
+	}
+	
+	@Test
+	public void testNoArgsUpdatePlaylistFailure() throws IOException {
+		final U1Meta meta = new U1Meta();
+		String playlistId = "playlist-id";
+		String name = null;
+		ArrayList<String> songList = null;
+		
+		final HttpPut httpRequest = new HttpPut("https://one.ubuntu.com" +
+				"/api/music/v2/playlists/" + playlistId + "/");
+		
+		httpRequest.setEntity(new StringEntity(U1CustomJson
+				.toPlaylistJson(name, songList)));
+		
+		String responseJson = U1ResponseBuilder.toPlaylistUpdatedJSON(meta);
+		httpResponse = Util.buildResponse(HttpStatus.SC_FORBIDDEN);
+		httpResponse.setEntity(new StringEntity(responseJson, "UTF-8"));
+		
+		final Sequence requestSequence = context.sequence("lifecycle");
+		context.checking(new Expectations() {{
+			oneOf(callback).onStart();
+					inSequence(requestSequence);
+					
+			oneOf(httpClient).execute(with(httpHost), with(sameRequest(httpRequest)));
+					inSequence(requestSequence);
+							will(returnValue(httpResponse));
+			
+			oneOf(callback).onFailure(with(sameStatusCodeFailure(
+					new Failure("", HttpStatus.SC_FORBIDDEN))));
+			
+			oneOf(callback).onFinish();
+					inSequence(requestSequence);
+		}});
+		
+		musicApi.updatePlaylist(playlistId, name, songList, callback);
 	}
 }

=== modified file 'src/test/com/ubuntuone/api/music/json/U1PlaylistJsonTest.java'
--- src/test/com/ubuntuone/api/music/json/U1PlaylistJsonTest.java	2012-11-12 15:33:22 +0000
+++ src/test/com/ubuntuone/api/music/json/U1PlaylistJsonTest.java	2012-11-12 15:33:23 +0000
@@ -35,6 +35,7 @@
 import com.ubuntuone.api.music.U1MusicAPI;
 import com.ubuntuone.api.music.model.U1Meta;
 import com.ubuntuone.api.music.model.U1Playlist;
+import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistCreateRequestListener;
 import com.ubuntuone.api.music.util.ResultRequestListener.U1PlaylistRequestListener;
 import com.ubuntuone.music.util.U1PlaylistBuilder;
 import com.ubuntuone.music.util.U1ResponseBuilder;
@@ -61,4 +62,22 @@
 		
 		U1PlaylistJson.fromJson(stream, callback);
 	}
+	
+	@Test
+	public void testFromPlaylistCreateResponse() throws IOException {
+		final U1Meta meta = new U1Meta();
+		final String playlistId = "playlist-id";
+		
+		String responseJson = U1ResponseBuilder
+				.toPlaylistCreatedJson(meta, playlistId);
+		InputStream stream = new ByteArrayInputStream(responseJson.getBytes());
+		final U1PlaylistCreateRequestListener callback =
+				context.mock(U1PlaylistCreateRequestListener.class);
+		
+		context.checking(new Expectations() {{
+			oneOf(callback).onSuccess(playlistId);
+		}});
+		
+		U1PlaylistJson.fromPlaylistCreateResponse(stream, callback);
+	}
 }

=== modified file 'src/test/com/ubuntuone/music/util/U1AlbumBuilder.java'
--- src/test/com/ubuntuone/music/util/U1AlbumBuilder.java	2012-09-28 01:45:13 +0000
+++ src/test/com/ubuntuone/music/util/U1AlbumBuilder.java	2012-11-12 15:33:23 +0000
@@ -25,7 +25,7 @@
 
 public class U1AlbumBuilder
 {
-	private String id = "1b861a8cbb0f52e99dd44054c6feb52b";
+	private String id = "62ef37486875acd62e0ed346c4c38312";
 	
 	private String albumUrl = String.format(ALBUM_URL_FMT, id);
 	private static final String ALBUM_URL_FMT =
@@ -33,6 +33,8 @@
 	
 	private String artist = "Default Artist";
 	
+	private String artistId = "52d53fd75b9907bf765d39c56330c587";
+	
 	private String title = "Default Title";
 	
 	private Long parsedDate = 1327937958L;
@@ -50,6 +52,7 @@
 		id = builder.id;
 		albumUrl = builder.albumUrl;
 		artist = builder.artist;
+		artistId = builder.artistId;
 		title = builder.title;
 		parsedDate = builder.parsedDate;
 		albumArtUrl = builder.albumArtUrl;
@@ -89,8 +92,8 @@
 	}
 	
 	public U1Album build() {
-		U1Album album = new U1Album(id, albumUrl, artist, title, parsedDate,
-				albumArtUrl, year);
+		U1Album album = new U1Album(id, albumUrl, artist, artistId, title,
+				parsedDate, albumArtUrl, year);
 		return album;
 	}
 }

=== modified file 'src/test/com/ubuntuone/music/util/U1ArtistBuilder.java'
--- src/test/com/ubuntuone/music/util/U1ArtistBuilder.java	2012-09-28 01:45:13 +0000
+++ src/test/com/ubuntuone/music/util/U1ArtistBuilder.java	2012-11-12 15:33:23 +0000
@@ -27,7 +27,7 @@
 
 public class U1ArtistBuilder
 {
-	private String id = "a5c59c0315098e6d67bb57610f7fb9b1";
+	private String id = "0441f9e2d94c39a70e21b83829259aa4";
 	
 	private String artistUrl = String.format(ARTIST_URL_FMT, id);
 	private static final String ARTIST_URL_FMT =

=== modified file 'src/test/com/ubuntuone/music/util/U1ResponseBuilder.java'
--- src/test/com/ubuntuone/music/util/U1ResponseBuilder.java	2012-11-12 15:33:22 +0000
+++ src/test/com/ubuntuone/music/util/U1ResponseBuilder.java	2012-11-12 15:33:23 +0000
@@ -43,7 +43,7 @@
 		return toJson(meta, title, null, null, items);
 	}
 	
-	public static String toJson(U1Meta meta, String title,
+	public static String toJson(U1Meta meta, String type,
 			String playlistId, String name, JSONString... items)
 			throws JsonGenerationException, IOException {
 		final JsonFactory factory = new JsonFactory();
@@ -58,7 +58,7 @@
 			g.writeEndObject();
 			
 			g.writeObjectFieldStart(RESPONSE); {
-				g.writeArrayFieldStart(title);
+				g.writeArrayFieldStart(type);
 				if (items != null) {
 					for (JSONString item : items) {
 						g.writeRawValue(item.toJSONString());
@@ -74,4 +74,51 @@
 		
 		return writer.toString();
 	}
+	
+	public static String toPlaylistCreatedJson(U1Meta meta, String playlistId)
+			throws JsonGenerationException, IOException {
+		final JsonFactory factory = new JsonFactory();
+		final StringWriter writer = new StringWriter(128);
+		final JsonGenerator g = factory.createJsonGenerator(writer);
+		
+		g.writeStartObject(); {
+			g.writeObjectFieldStart(META); {
+				g.writeNumberField(STATUS, meta.getStatus());
+				g.writeStringField(MSG, meta.getMessage());
+			}
+			g.writeEndObject();
+			
+			g.writeObjectFieldStart(RESPONSE); {
+				g.writeStringField("id", playlistId);
+			}
+			g.writeEndObject();
+			
+		}
+		g.writeEndObject();
+		g.close();
+		
+		return writer.toString();
+	}
+	
+	public static String toPlaylistUpdatedJSON(U1Meta meta)
+			throws JsonGenerationException, IOException {
+		final JsonFactory factory = new JsonFactory();
+		final StringWriter writer = new StringWriter(128);
+		final JsonGenerator g = factory.createJsonGenerator(writer);
+		
+		g.writeStartObject(); {
+			g.writeObjectFieldStart(META); {
+				g.writeNumberField(STATUS, meta.getStatus());
+				g.writeStringField(MSG, meta.getMessage());
+			}
+			g.writeEndObject();
+			
+			g.writeObjectFieldStart(RESPONSE);
+			g.writeEndObject();
+		}
+		g.writeEndObject();
+		g.close();
+		
+		return writer.toString();
+	}
 }

=== modified file 'src/test/com/ubuntuone/music/util/U1SongBuilder.java'
--- src/test/com/ubuntuone/music/util/U1SongBuilder.java	2012-09-28 01:45:13 +0000
+++ src/test/com/ubuntuone/music/util/U1SongBuilder.java	2012-11-12 15:33:23 +0000
@@ -31,7 +31,7 @@
 	private static final String SONG_URL_FMT =
 			"https://one.ubuntu.com/api/music/v2/songs/%s/";
 	
-	private String albumId = "cdd9dfe8c9583c60e4c69bc199cb0d7b";
+	private String albumId = "62ef37486875acd62e0ed346c4c38312";
 	
 	private String albumArtist = "Default Artist";
 	
@@ -57,6 +57,8 @@
 	
 	private String artist = "Default Track Artist";
 	
+	private String artistId = "52d53fd75b9907bf765d39c56330c587";
+	
 	private String title = "Default Track Title";
 	
 	private String suffix = "mp3";
@@ -88,6 +90,7 @@
 		duration = builder.size;
 		bitRate = builder.bitRate;
 		artist = builder.artist;
+		artistId = builder.artistId;
 		title = builder.title;
 		suffix = builder.suffix;
 		contentType = builder.contentType;
@@ -113,7 +116,8 @@
 	public U1Song build() {
 		U1Song song = new U1Song(id, songUrl, albumId, albumArtist, album,
 				songArtUrl, genre, year, discNumber, track, duration, size,
-				bitRate, albumArtist, title, suffix, contentType, songStreamUrl, path);
+				bitRate, artist, artistId, title, suffix, contentType,
+				songStreamUrl, path);
 		return song;
 	}
 }