Updates Retrofit Gerrit code example

David Weiser · David Weiser · commit fe9638040c1f · 2017-03-13T12:31:07.000+01:00
diff --git a/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/Controller.java b/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/Controller.java
@@ -8,9 +8,11 @@
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
+import okhttp3.Credentials;
 import okhttp3.OkHttpClient;
 import okhttp3.ResponseBody;
 import okhttp3.logging.HttpLoggingInterceptor;
+import okhttp3.logging.HttpLoggingInterceptor.Level;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.gson.GsonConverterFactory;
@@ -30,11 +32,11 @@ public Controller(UserInterface userInterface) {
 
 	private void initGerritApi() {
 		HttpLoggingInterceptor loggerInterceptor = new HttpLoggingInterceptor();
-		// loggerInterceptor.setLevel(Level.BODY);
+		 loggerInterceptor.setLevel(Level.BODY);
 
 		OkHttpClient okHttpClient = new OkHttpClient.Builder().addInterceptor(loggerInterceptor).build();
 
-		Gson gson = new GsonBuilder().setLenient().create();
+		Gson gson = new GsonBuilder().registerTypeAdapter(ReviewInput.class, new JsonSerializer()).setLenient().create();
 
 		Retrofit retrofit = new Retrofit.Builder().baseUrl(BASE_URL)
 				.addCallAdapterFactory(RxJava2CallAdapterFactory.create())
@@ -61,11 +63,12 @@ public void loadChangesForUser(int userId) {
 				.observeOn(Schedulers.single()).subscribeWith(getChangesObserver()));
 	}
 
-	public void upvote(int i) {
+	public void upvote(String username, String password, int i) {
 		Change currentChange = currentData.get(i);
-		// compositeDisposable.add(gerritAPI.postUpvote(currentChange.getChangeId(),
-		// currentChange.getCurrentRevision())
-		// .subscribeOn(Schedulers.io()).observeOn(Schedulers.single()).subscribeWith(getUpvoteObserver()));
+		compositeDisposable.add(gerritAPI
+				.postUpvote(Credentials.basic(username, username), currentChange.getChangeId(),
+						currentChange.getCurrentRevision(), new ReviewInput())
+				.subscribeOn(Schedulers.io()).observeOn(Schedulers.single()).subscribeWith(getUpvoteObserver()));
 	}
 
 	private DisposableSingleObserver<List<Change>> getChangesObserver() {
@@ -89,6 +92,7 @@ private DisposableSingleObserver<ResponseBody> getUpvoteObserver() {
 
 			@Override
 			public void onSuccess(ResponseBody value) {
+
 			}
 
 			@Override
diff --git a/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/GerritAPI.java b/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/GerritAPI.java
@@ -4,7 +4,9 @@
 
 import io.reactivex.Single;
 import okhttp3.ResponseBody;
+import retrofit2.http.Body;
 import retrofit2.http.GET;
+import retrofit2.http.Header;
 import retrofit2.http.POST;
 import retrofit2.http.Path;
 import retrofit2.http.Url;
@@ -21,5 +23,5 @@ public interface GerritAPI {
 	Single<List<Change>> getChangesForUser(@Url String url);
 
 	@POST("changes/{change-id}/revisions/{revision-id}/review")
-	Single<ResponseBody> postUpvote(@Path("change-id") String changeId, @Path("revision-id") String revisionId);
+	Single<ResponseBody> postUpvote(@Header("Authentication") String credentials, @Path("change-id") String changeId, @Path("revision-id") String revisionId, @Body ReviewInput reviewInput);
 }
diff --git a/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/JsonSerializer.java b/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/JsonSerializer.java
@@ -0,0 +1,24 @@
+package com.vogella.java.retrofitgerrit;
+
+import java.lang.reflect.Type;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonSerializationContext;
+
+public class JsonSerializer implements com.google.gson.JsonSerializer<ReviewInput>{
+
+	@Override
+	public JsonElement serialize(ReviewInput src, Type typeOfSrc, JsonSerializationContext context) {
+		JsonObject codeReviewJson = new JsonObject();
+		JsonElement codeReviewElement = context.serialize(src.getCodeReview());
+		codeReviewJson.add("Code-Review", codeReviewElement);
+		
+		JsonObject parentJson = new JsonObject();
+		JsonElement parentElement = context.serialize(codeReviewJson);
+		parentJson.add("labels", parentElement);
+		
+		return parentJson;
+	}
+
+}
diff --git a/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/ReviewInput.java b/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/ReviewInput.java
@@ -0,0 +1,17 @@
+package com.vogella.java.retrofitgerrit;
+
+import com.google.gson.annotations.SerializedName;
+
+public class ReviewInput {
+	
+	@SerializedName("Code-Review")
+	private String codeReview = "+1";
+
+	public String getCodeReview() {
+		return codeReview;
+	}
+
+	public void setCodeReview(String codeReview) {
+		this.codeReview = codeReview;
+	}
+}
diff --git a/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/UserInterface.java b/com.vogella.java.retrofitgerrit/src/main/java/com/vogella/java/retrofitgerrit/UserInterface.java
@@ -7,6 +7,7 @@
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.List;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
@@ -23,6 +24,11 @@ public class UserInterface {
 	private Text userIdText;
 	private Text projectNameText;
 	private Text upvoteText;
+	private Text usernameText;
+	private Text passwordText;
+
+	private Label passwordLabel;
+	private Label usernameLabel;
 
 	private Display display;
 	private Controller controller;
@@ -38,16 +44,34 @@ public void initUi() {
 		GridData gridData;
 		display = new Display();
 		Shell shell = new Shell(display);
-		shell.setSize(400, 300);
-
+		shell.setSize(500, 400);
+		
 		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
+		gridLayout.numColumns = 4;
 		shell.setLayout(gridLayout);
 
+		usernameLabel = new Label(shell, SWT.NONE);
+		usernameLabel.setText("Username:");
+		gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		usernameLabel.setLayoutData(gridData);
+
+		usernameText = new Text(shell, SWT.NONE);
+		gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		usernameText.setLayoutData(gridData);
+		
+		passwordLabel = new Label(shell, SWT.NONE);
+		passwordLabel.setText("Password:");
+		gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		passwordLabel.setLayoutData(gridData);
+		
+		passwordText = new Text(shell, SWT.PASSWORD);
+		gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+		passwordText.setLayoutData(gridData);
+				
 		allChangesButton = new Button(shell, SWT.PUSH);
 		allChangesButton.setText("Get all changes");
 		gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
-		gridData.horizontalSpan = 3;
+		gridData.horizontalSpan = 4;
 		allChangesButton.setLayoutData(gridData);
 		allChangesButton.addSelectionListener(new SelectionAdapter() {
 			@Override
@@ -64,6 +88,7 @@ public void widgetDefaultSelected(SelectionEvent e) {
 		changes = new List(shell, SWT.NONE);
 		gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
 		gridData.verticalSpan = 4;
+		gridData.horizontalSpan = 2;
 		changes.setLayoutData(gridData);
 		changes.addSelectionListener(new SelectionAdapter() {
 
@@ -139,7 +164,7 @@ public void widgetDefaultSelected(SelectionEvent e) {
 
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				controller.upvote(changes.getSelectionIndex());
+				controller.upvote(usernameText.getText(), passwordText.getText(), changes.getSelectionIndex());
 			}
 
 			@Override
