diff options
Diffstat (limited to 'org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core')
4 files changed, 11 insertions, 16 deletions
diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java index dbf09f111..b35ad1c20 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/GerritConnector.java @@ -312,7 +312,6 @@ public class GerritConnector extends ReviewsConnector { } } - @SuppressWarnings("restriction") @Override public void updateTaskFromTaskData(TaskRepository taskRepository, ITask task, TaskData taskData) { Date oldModificationDate = task.getModificationDate(); diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java index 97e753076..5169108f5 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritClient.java @@ -611,8 +611,7 @@ public abstract class GerritClient extends ReviewsClient { //Try to remove the reviewer from the change try { //Currently using a string to return as the only response from the gerrit api will be an http status - String result = restClient.executeDeleteRestRequest(uri, new ReviewerInput(reviewerId), String.class, null, - monitor); + restClient.executeDeleteRestRequest(uri, new ReviewerInput(reviewerId), String.class, null, monitor); } catch (GerritHttpException e) { if (e.getResponseCode() == HttpStatus.SC_NOT_FOUND) { reviewerResult.addError(new ReviewerResult.Error(null, reviewerId)); diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java index 436e10e72..acb2b7d40 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/GerritHttpClient.java @@ -55,7 +55,7 @@ import com.google.gson.reflect.TypeToken; /** * Abstract class that handles the http communications with the Gerrit server. - * + * * @author Daniel Olsson, ST Ericsson * @author Thomas Westling * @author Steffen Pingel @@ -136,7 +136,6 @@ public class GerritHttpClient { this.errorHandler = handler; } - @SuppressWarnings("null") @Override public HttpMethodBase createMethod() throws IOException { HttpMethodBase method = null; @@ -257,7 +256,7 @@ public class GerritHttpClient { /** * Send a JSON request to the Gerrit server. - * + * * @return The JSON response * @throws GerritException */ @@ -276,8 +275,8 @@ public class GerritHttpClient { return restRequest(HttpMethod.POST, serviceUri, input, resultType, handler, monitor); } - public <T> T getRestRequest(final String serviceUri, Type resultType, IProgressMonitor monitor) throws IOException, - GerritException { + public <T> T getRestRequest(final String serviceUri, Type resultType, IProgressMonitor monitor) + throws IOException, GerritException { return restRequest(HttpMethod.GET, serviceUri, null, resultType, null, monitor); } @@ -295,8 +294,8 @@ public class GerritHttpClient { return restRequest(HttpMethod.DELETE, serviceUri, input, resultType, handler, monitor); } - private <T> T restRequest(final HttpMethod httpMethod, final String serviceUri, final Object input, - Type resultType, ErrorHandler handler, IProgressMonitor monitor) throws IOException, GerritException { + private <T> T restRequest(final HttpMethod httpMethod, final String serviceUri, final Object input, Type resultType, + ErrorHandler handler, IProgressMonitor monitor) throws IOException, GerritException { Assert.isNotNull(httpMethod, "HTTP Method must be not null."); //$NON-NLS-1$ Assert.isNotNull(serviceUri, "REST Service URI must be not null."); //$NON-NLS-1$ Assert.isNotNull(resultType, "Output type must be not null."); //$NON-NLS-1$ @@ -476,8 +475,8 @@ public class GerritHttpClient { return null; } - private int authenticateOpenIdService(String openIdProvider, IProgressMonitor monitor) throws IOException, - GerritException { + private int authenticateOpenIdService(String openIdProvider, IProgressMonitor monitor) + throws IOException, GerritException { JSonSupport json = new JSonSupport(); List<Object> args = new ArrayList<Object>(2); @@ -641,8 +640,8 @@ public class GerritHttpClient { return HttpStatus.SC_NOT_FOUND; } - int authenticateForm(AuthenticationCredentials credentials, IProgressMonitor monitor) throws IOException, - GerritException { + int authenticateForm(AuthenticationCredentials credentials, IProgressMonitor monitor) + throws IOException, GerritException { // try standard basic/digest/ntlm authentication first String repositoryUrl = getUrl(); AuthScope authScope = new AuthScope(WebUtil.getHost(repositoryUrl), WebUtil.getPort(repositoryUrl), null, diff --git a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritPerson.java b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritPerson.java index 562004986..bfe11050d 100644 --- a/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritPerson.java +++ b/org.eclipse.mylyn.gerrit.core/src/org/eclipse/mylyn/internal/gerrit/core/client/data/GerritPerson.java @@ -18,8 +18,6 @@ public class GerritPerson { private String name; - private String _account_id; - public String getName() { return name; } |