514082: Allow Marketplace REST API to return a list of favourite lists
Adapted favorites service to include full username and list name.
Bug: 514082
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=514082
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/UserFavoritesService.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/UserFavoritesService.java
index cb11b4f..eab1415 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/UserFavoritesService.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/UserFavoritesService.java
@@ -99,13 +99,13 @@
.compile(String.format(JSON_ATTRIBUTE_OBJECT_LIST_REGEX, "users"), Pattern.MULTILINE); //$NON-NLS-1$
private static final Pattern JSON_USER_ID_ATTRIBUTE_PATTERN = Pattern
- .compile(String.format(JSON_ATTRIBUTE_REGEX, "id|user_?id|user|name"), Pattern.MULTILINE); //$NON-NLS-1$
+ .compile(String.format(JSON_ATTRIBUTE_REGEX, "name"), Pattern.MULTILINE); //$NON-NLS-1$
private static final Pattern JSON_OWNER_ATTRIBUTE_PATTERN = Pattern
- .compile(String.format(JSON_ATTRIBUTE_REGEX, "owner|owner_?name"), Pattern.MULTILINE); //$NON-NLS-1$
+ .compile(String.format(JSON_ATTRIBUTE_REGEX, "(?:full_)?name"), Pattern.MULTILINE); //$NON-NLS-1$
private static final Pattern JSON_NAME_ATTRIBUTE_PATTERN = Pattern
- .compile(String.format(JSON_ATTRIBUTE_REGEX, "name|description|list_?name"), Pattern.MULTILINE); //$NON-NLS-1$
+ .compile(String.format(JSON_ATTRIBUTE_REGEX, "mpc_list_name"), Pattern.MULTILINE); //$NON-NLS-1$
private static final Pattern JSON_CONTENT_ID_ATTRIBUTE_PATTERN = Pattern
.compile(String.format(JSON_ATTRIBUTE_REGEX, "content_id"), Pattern.MULTILINE); //$NON-NLS-1$