diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateReportRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs similarity index 70% rename from src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateReportRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs index 0056abd2..977da090 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GenerateReportRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GeneratePreviewReportRequest.cs @@ -9,13 +9,13 @@ using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts { /// - /// The service request to generate report for the changes. + /// The service request to generate preview report describing the changes. /// - public class GenerateReportRequest + public class GeneratePreviewReportRequest { /// /// Request definition /// - public static readonly RequestType Type = RequestType.Create("tabledesigner/report"); + public static readonly RequestType Type = RequestType.Create("tabledesigner/generatepreviewreport"); } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GetTableDesignerInfoRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/InitializeTableDesignerRequest.cs similarity index 100% rename from src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/GetTableDesignerInfoRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/InitializeTableDesignerRequest.cs diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/SaveTableChangesRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/PublishTableChangesRequest.cs similarity index 58% rename from src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/SaveTableChangesRequest.cs rename to src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/PublishTableChangesRequest.cs index 3a77e52a..23c811c6 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/SaveTableChangesRequest.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/Contracts/Requests/PublishTableChangesRequest.cs @@ -8,18 +8,18 @@ using Microsoft.SqlTools.Utility; namespace Microsoft.SqlTools.ServiceLayer.TableDesigner.Contracts { - public class SaveTableChangesResponse + public class PublishTableChangesResponse { } /// - /// The service request to save the changes. + /// The service request to publish the changes. /// - public class SaveTableChangesRequest + public class PublishTableChangesRequest { /// /// Request definition /// - public static readonly RequestType Type = RequestType.Create("tabledesigner/save"); + public static readonly RequestType Type = RequestType.Create("tabledesigner/publish"); } } diff --git a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs index 6f728101..7a43f410 100644 --- a/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs +++ b/src/Microsoft.SqlTools.ServiceLayer/TableDesigner/TableDesignerService.cs @@ -53,9 +53,9 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner this.ServiceHost = serviceHost; this.ServiceHost.SetRequestHandler(InitializeTableDesignerRequest.Type, HandleInitializeTableDesignerRequest); this.ServiceHost.SetRequestHandler(ProcessTableDesignerEditRequest.Type, HandleProcessTableDesignerEditRequest); - this.ServiceHost.SetRequestHandler(SaveTableChangesRequest.Type, HandleSaveTableChangesRequest); + this.ServiceHost.SetRequestHandler(PublishTableChangesRequest.Type, HandlePublishTableChangesRequest); this.ServiceHost.SetRequestHandler(GenerateScriptRequest.Type, HandleGenerateScriptRequest); - this.ServiceHost.SetRequestHandler(GenerateReportRequest.Type, HandleGenerateReportRequest); + this.ServiceHost.SetRequestHandler(GeneratePreviewReportRequest.Type, HandleGeneratePreviewReportRequest); this.ServiceHost.SetRequestHandler(DisposeTableDesignerRequest.Type, HandleDisposeTableDesignerRequest); } private Task HandleRequest(RequestContext requestContext, Func action) @@ -124,13 +124,13 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner }); } - private Task HandleSaveTableChangesRequest(TableInfo tableInfo, RequestContext requestContext) + private Task HandlePublishTableChangesRequest(TableInfo tableInfo, RequestContext requestContext) { - return this.HandleRequest(requestContext, async () => + return this.HandleRequest(requestContext, async () => { var tableDesigner = this.GetTableDesigner(tableInfo); tableDesigner.CommitChanges(); - await requestContext.SendResult(new SaveTableChangesResponse()); + await requestContext.SendResult(new PublishTableChangesResponse()); }); } @@ -144,7 +144,7 @@ namespace Microsoft.SqlTools.ServiceLayer.TableDesigner }); } - private Task HandleGenerateReportRequest(TableInfo tableInfo, RequestContext requestContext) + private Task HandleGeneratePreviewReportRequest(TableInfo tableInfo, RequestContext requestContext) { return this.HandleRequest(requestContext, async () => {