492916: Add eclipse.uuid to Marketplace REST calls

Removing UUID again as per bug 495484

Bug: 492916
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=492916

4 files changed, 2 insertions, 43 deletions

diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
index 7c634a14..e7db021c 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/ServiceLocator.java
@@ -541,13 +541,6 @@ public class ServiceLocator implements IMarketplaceServiceLocator {
 		addDefaultRequestMetaParameter(requestMetaParameters, DefaultMarketplaceService.META_PARAM_CLIENT_VERSION,
 				clientBundle.getVersion().toString());
 
-		String uuid = bundleContext.getProperty(DefaultMarketplaceService.META_PARAM_ECLIPSE_UUID);
-		String useUuid = bundleContext.getProperty(IMarketplaceServiceLocator.USE_ECLIPSE_UUID_TRACKING_PROPERTY_NAME);
-		if (uuid != null && useUuid != null && !Boolean.parseBoolean(useUuid)) {
-			uuid = null;
-		}
-		addDefaultRequestMetaParameter(requestMetaParameters, DefaultMarketplaceService.META_PARAM_ECLIPSE_UUID, uuid);
-
 		addDefaultRequestMetaParameter(requestMetaParameters, DefaultMarketplaceService.META_PARAM_OS,
 				Platform.getOS());
 		addDefaultRequestMetaParameter(requestMetaParameters, DefaultMarketplaceService.META_PARAM_WS,
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
index 266386f3..4c572df4 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/DefaultMarketplaceService.java
@@ -58,7 +58,6 @@ import org.eclipse.epp.mpc.core.service.IMarketplaceService;
 import org.eclipse.epp.mpc.core.service.IMarketplaceServiceLocator;
 import org.eclipse.epp.mpc.core.service.IUserFavoritesService;
 import org.eclipse.epp.mpc.core.service.ServiceHelper;
-import org.eclipse.osgi.service.environment.EnvironmentInfo;
 import org.eclipse.osgi.util.NLS;
 
 /**
@@ -189,20 +188,6 @@ MarketplaceService {
 	public static final String META_PARAM_PRODUCT = "product"; //$NON-NLS-1$
 
 	/**
-	 * Anonymous unique id for local machine, as provided by {@link EnvironmentInfo}.
-	 * <p>
-	 * Clients can override the generated UUID in <code>~/.eclipse/eclipse.uuid</code> or set
-	 * {@link IMarketplaceServiceLocator#USE_ECLIPSE_UUID_TRACKING_PROPERTY_NAME} to false in their java system
-	 * properties (e.g. in the eclipse.ini)
-	 *
-	 * @see {@link #setRequestMetaParameters(Map)}
-	 * @see IMarketplaceServiceLocator#USE_ECLIPSE_UUID_TRACKING_PROPERTY_NAME
-	 * @see <a href="http://eclip.se/492916">bug 492916</a>
-	 * @see <a href="http://eclip.se/490112">bug 490112</a>
-	 */
-	public static final String META_PARAM_ECLIPSE_UUID = "eclipse.uuid"; //$NON-NLS-1$
-
-	/**
 	 * parameter identifying a list of nodes for a {@link #related(List, IProgressMonitor)} query
 	 */
 	public static final String PARAM_BASED_ON_NODES = "nodes"; //$NON-NLS-1$
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientTransport.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientTransport.java
index 894f1217..1f47659a 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientTransport.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/transport/httpclient/HttpClientTransport.java
@@ -50,7 +50,6 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.epp.internal.mpc.core.MarketplaceClientCore;
 import org.eclipse.epp.internal.mpc.core.ServiceLocator;
 import org.eclipse.epp.internal.mpc.core.service.DefaultMarketplaceService;
-import org.eclipse.epp.mpc.core.service.IMarketplaceServiceLocator;
 import org.eclipse.epp.mpc.core.service.ITransport;
 import org.eclipse.epp.mpc.core.service.ServiceUnavailableException;
 import org.eclipse.userstorage.internal.StorageProperties;
@@ -111,11 +110,10 @@ public class HttpClientTransport implements ITransport {
 		String java = getAgentJava(context);
 		String os = getAgentOS(context);
 		String language = getProperty(context, "osgi.nl", "unknownLanguage");//$NON-NLS-1$//$NON-NLS-2$
-		String uuid = getAgentUuid(context);
 		String agentDetail = getAgentDetail(context);
 
-		String userAgent = MessageFormat.format("mpc/{0} (Java {1}; {2}; {3}; {4}) {5}", //$NON-NLS-1$
-				/*{0}*/version, /*{1}*/java, /*{2}*/os, /*{3}*/language, /*{4}*/uuid, /*{5}*/agentDetail);
+		String userAgent = MessageFormat.format("mpc/{0} (Java {1}; {2}; {3}) {4}", //$NON-NLS-1$
+				/*{0}*/version, /*{1}*/java, /*{2}*/os, /*{3}*/language, /*{4}*/agentDetail);
 		return userAgent;
 	}
 
@@ -144,14 +142,6 @@ public class HttpClientTransport implements ITransport {
 		return os;
 	}
 
-	private static String getAgentUuid(BundleContext context) {
-		String uuid;
-		boolean trackUuid = Boolean.parseBoolean(
-				getProperty(context, IMarketplaceServiceLocator.USE_ECLIPSE_UUID_TRACKING_PROPERTY_NAME, "true")); //$NON-NLS-1$
-		uuid = trackUuid ? getProperty(context, "eclipse.uuid", "unknownUUID") : "unknownUUID"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
-		return uuid;
-	}
-
 	private static String getAgentDetail(BundleContext context) {
 		String agentDetail;
 		agentDetail = getProperty(context, USER_AGENT_PROPERTY, null);
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/mpc/core/service/IMarketplaceServiceLocator.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/mpc/core/service/IMarketplaceServiceLocator.java
index 08e84ff5..dda43523 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/mpc/core/service/IMarketplaceServiceLocator.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/mpc/core/service/IMarketplaceServiceLocator.java
@@ -67,15 +67,6 @@ public interface IMarketplaceServiceLocator {
 	public static final String DEFAULT_MARKETPLACE_PROPERTY_NAME = MarketplaceService.class.getName() + ".url"; //$NON-NLS-1$
 
 	/**
-	 * System property key to override the use of an anonymous uuid to identify the local machine in marketplace
-	 * requests.
-	 *
-	 * @see DefaultMarketplaceService#META_PARAM_ECLIPSE_UUID
-	 */
-	public static final String USE_ECLIPSE_UUID_TRACKING_PROPERTY_NAME = IMarketplaceService.class.getName()
-			+ ".uuid"; //$NON-NLS-1$
-
-	/**
 	 * Property key for registered IMarketplaceServiceLocator OSGi services indicating the URL of the catalog service.
 	 *
 	 * @see #DEFAULT_URL