416961: [MPC] Include more details about the Eclipse installation when MPC needs to submit an installation report
- exclude meta data for news feed request
Bug: 416961
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=416961
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 09ad4ae..dcabd63 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
@@ -365,7 +365,7 @@
public News news(IProgressMonitor monitor) throws CoreException {
try {
- Marketplace marketplace = processRequest(API_NEWS_URI + '/' + API_URI_SUFFIX, monitor);
+ Marketplace marketplace = processRequest(API_NEWS_URI + '/' + API_URI_SUFFIX, false, monitor);
return marketplace.getNews();
} catch (CoreException ex) {
final Throwable cause = ex.getCause();
diff --git a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/RemoteMarketplaceService.java b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/RemoteMarketplaceService.java
index 24de47f..8e26c24 100644
--- a/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/RemoteMarketplaceService.java
+++ b/org.eclipse.epp.mpc.core/src/org/eclipse/epp/internal/mpc/core/service/RemoteMarketplaceService.java
@@ -69,6 +69,11 @@
}
protected T processRequest(String relativeUrl, IProgressMonitor monitor) throws CoreException {
+ return processRequest(relativeUrl, true, monitor);
+ }
+
+ protected T processRequest(String relativeUrl, boolean withMetaParams, IProgressMonitor monitor)
+ throws CoreException {
URI baseUri;
try {
baseUri = baseUrl.toURI();
@@ -77,11 +82,16 @@
throw new IllegalStateException(e);
}
- return processRequest(baseUri.toString(), relativeUrl, monitor);
+ return processRequest(baseUri.toString(), relativeUrl, withMetaParams, monitor);
+ }
+
+ protected T processRequest(String baseUri, String relativePath, IProgressMonitor monitor) throws CoreException {
+ return processRequest(baseUri, relativePath, true, monitor);
}
@SuppressWarnings({ "unchecked" })
- protected T processRequest(String baseUri, String relativePath, IProgressMonitor monitor) throws CoreException {
+ protected T processRequest(String baseUri, String relativePath, boolean withMetaParams, IProgressMonitor monitor)
+ throws CoreException {
checkConfiguration();
if (baseUri == null || relativePath == null) {
throw new IllegalArgumentException();
@@ -92,7 +102,10 @@
uri += '/';
}
uri += relativePath;
- uri = addMetaParameters(uri);
+
+ if (withMetaParams) {
+ uri = addMetaParameters(uri);
+ }
URI location;
try {
