opendev/gerrit
Code Issues Proposed changes

StreamEvents: Correctly serialize Project.NameKey elements in json

Browse Source 
Add a ProjectNameKeySerializer so that the project attribute gets
serialized correctly in the json output, i.e.:

  "project":"project-name"

instead of:

  "project": { "name" : "project-name" }

Change-Id: I96dbb4c38f2da506165d5905a9edd8f01a87c899
Signed-off-by: Eryk Szymanski <eryksz@gmail.com>
This commit is contained in:
Eryk Szymanski
2016-07-08 15:01:17 +02:00
committed by David Pursehouse
parent cef8281528
commit a26067f126
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
gerrit-server/src/main/java/com/google/gerrit/server/events/ProjectNameKeySerializer.java Normal file
View File

@@ -0,0 +1,32 @@
// Copyright (C) 2016 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package com.google.gerrit.server.events;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import java.lang.reflect.Type;
public class ProjectNameKeySerializer
implements JsonSerializer<Project.NameKey> {
@Override
public JsonElement serialize(Project.NameKey project, Type typeOfSrc,
JsonSerializationContext context) {
return new JsonPrimitive(project.get());
}
}

4
gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java
View File

@@ -22,10 +22,12 @@ import com.google.gerrit.common.data.GlobalCapability;
import com.google.gerrit.extensions.annotations.RequiresCapability;
import com.google.gerrit.extensions.registration.DynamicSet;
import com.google.gerrit.extensions.registration.RegistrationHandle;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.server.CurrentUser;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.events.Event;
import com.google.gerrit.server.events.EventTypes;
import com.google.gerrit.server.events.ProjectNameKeySerializer;
import com.google.gerrit.server.events.SupplierSerializer;
import com.google.gerrit.server.git.WorkQueue;
import com.google.gerrit.server.git.WorkQueue.CancelableRunnable;
@@ -160,6 +162,8 @@ final class StreamEvents extends BaseCommand {
gson = new GsonBuilder()
.registerTypeAdapter(Supplier.class, new SupplierSerializer())
.registerTypeAdapter(
Project.NameKey.class, new ProjectNameKeySerializer())
.create();
}