From 7dabec66397b7d3dabf4e93ff042c411ed1cac10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Sun, 5 Nov 2017 20:24:00 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30688 --- .../configuration-nexio-ingest.json | 2 +- client/Maestro/MaestroForm.Designer.cs | 48 ++---- client/Maestro/MaestroForm.Metadata.cs | 3 +- client/Maestro/Program.cs | 6 +- client/Maestro/Properties/AssemblyInfo.cs | 4 +- .../installforge-installer-project.ifp | Bin 3576 -> 3580 bytes client/Maestro/Targets/FXPTargetProcessor.cs | 4 +- client/OctopusClient/OctopusAPI.cs | 3 +- client/OctopusClient/OctopusIDSelector.cs | 2 +- client/PlanAIRClient/TrafficIDSelector.cs | 6 +- .../PlanAIRClient/Workers/MaterialWorker.cs | 5 +- .../jobtemplates/retrieve-ondemand.xml | 4 +- .../osgi/rest/octopus/OctopusRESTService.java | 142 +++++++++--------- 13 files changed, 107 insertions(+), 122 deletions(-) diff --git a/client/Maestro/Configuration/configuration-nexio-ingest.json b/client/Maestro/Configuration/configuration-nexio-ingest.json index 596cbe60..b3bd70bf 100644 --- a/client/Maestro/Configuration/configuration-nexio-ingest.json +++ b/client/Maestro/Configuration/configuration-nexio-ingest.json @@ -1,6 +1,6 @@ { "title": "NEXIO betöltő", - "active": true, + "active": false, "startInTray": false, "enableCustomMetadataId": true, "player": { diff --git a/client/Maestro/MaestroForm.Designer.cs b/client/Maestro/MaestroForm.Designer.cs index 546aa09d..0e5d6e6b 100644 --- a/client/Maestro/MaestroForm.Designer.cs +++ b/client/Maestro/MaestroForm.Designer.cs @@ -84,12 +84,10 @@ namespace Maestro { this.bindingSourceJobs = new System.Windows.Forms.BindingSource(this.components); this.tabPage2 = new System.Windows.Forms.TabPage(); this.dataGridMessages = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.timeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.messageDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.systemMessageBindingSource = new System.Windows.Forms.BindingSource(this.components); this.metadataInfoBindingSource = new System.Windows.Forms.BindingSource(this.components); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.groupSource.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridSource)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit(); @@ -732,9 +730,7 @@ namespace Maestro { this.dataGridMessages.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dataGridMessages.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2, - this.timeDataGridViewTextBoxColumn, - this.messageDataGridViewTextBoxColumn}); + this.dataGridViewTextBoxColumn2}); this.dataGridMessages.DataSource = this.systemMessageBindingSource; dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Window; @@ -768,6 +764,14 @@ namespace Maestro { this.dataGridMessages.Size = new System.Drawing.Size(988, 92); this.dataGridMessages.TabIndex = 1; // + // systemMessageBindingSource + // + this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage); + // + // metadataInfoBindingSource + // + this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo); + // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells; @@ -787,30 +791,6 @@ namespace Maestro { this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.ReadOnly = true; // - // timeDataGridViewTextBoxColumn - // - this.timeDataGridViewTextBoxColumn.DataPropertyName = "Time"; - this.timeDataGridViewTextBoxColumn.HeaderText = "Time"; - this.timeDataGridViewTextBoxColumn.Name = "timeDataGridViewTextBoxColumn"; - this.timeDataGridViewTextBoxColumn.ReadOnly = true; - this.timeDataGridViewTextBoxColumn.Width = 60; - // - // messageDataGridViewTextBoxColumn - // - this.messageDataGridViewTextBoxColumn.DataPropertyName = "Message"; - this.messageDataGridViewTextBoxColumn.HeaderText = "Message"; - this.messageDataGridViewTextBoxColumn.Name = "messageDataGridViewTextBoxColumn"; - this.messageDataGridViewTextBoxColumn.ReadOnly = true; - this.messageDataGridViewTextBoxColumn.Width = 83; - // - // systemMessageBindingSource - // - this.systemMessageBindingSource.DataSource = typeof(Maestro.SystemMessage); - // - // metadataInfoBindingSource - // - this.metadataInfoBindingSource.DataSource = typeof(Maestro.Metadata.MetadataInfo); - // // MaestroForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -904,8 +884,6 @@ namespace Maestro { private System.Windows.Forms.BindingSource systemMessageBindingSource; private System.Windows.Forms.Label lbSourceTitle; private System.Windows.Forms.DataGridView dataGridMessages; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn columnLabel; private System.Windows.Forms.DataGridViewTextBoxColumn columnID; private Commons.DataGridViewProgressColumn Progress; @@ -915,8 +893,8 @@ namespace Maestro { private System.Windows.Forms.DataGridViewTextBoxColumn columnInput; private System.Windows.Forms.DataGridViewTextBoxColumn columnOutput; private System.Windows.Forms.DataGridViewTextBoxColumn columnKillDate; - private System.Windows.Forms.DataGridViewTextBoxColumn timeDataGridViewTextBoxColumn; - private System.Windows.Forms.DataGridViewTextBoxColumn messageDataGridViewTextBoxColumn; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; } } diff --git a/client/Maestro/MaestroForm.Metadata.cs b/client/Maestro/MaestroForm.Metadata.cs index 5e74d6ef..0606f555 100644 --- a/client/Maestro/MaestroForm.Metadata.cs +++ b/client/Maestro/MaestroForm.Metadata.cs @@ -144,7 +144,8 @@ namespace Maestro { segments = null; return; } - + if (segments != null) + segments.Clear(); foreach (MovieSegment actual in movieSegments) { Segment actualSegment = segmentConverter.ConvertToSegment(actual); if (segments == null) diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs index 676ae4fa..784c5681 100644 --- a/client/Maestro/Program.cs +++ b/client/Maestro/Program.cs @@ -119,9 +119,11 @@ namespace Maestro { if (String.IsNullOrEmpty(replacementHost)) return; var mediaCubeProvider = config.GetMetadataProvider(); - mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address); + if (mediaCubeProvider != null) + mediaCubeProvider.Server.Address = replaceAuthority(replacementHost, mediaCubeProvider.Server.Address); var octopusProvider = config.GetMetadataProvider(); - octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address); + if (octopusProvider != null) + octopusProvider.Server.Address = replaceAuthority(replacementHost, octopusProvider.Server.Address); if (config.Source is NEXIOSource) config.Source.Local.Address = replaceAuthority(replacementHost, config.Source.Local.Address); } diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 08ceaa4d..5ff6cda9 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.9.4.0")] -[assembly: AssemblyFileVersion("1.9.4.0")] +[assembly: AssemblyVersion("1.9.4.2")] +[assembly: AssemblyFileVersion("1.9.4.2")] diff --git a/client/Maestro/Resources/installforge-installer-project.ifp b/client/Maestro/Resources/installforge-installer-project.ifp index 9115e9bd1312bb5206178f96b77eb1069fbe3b14..dd18bcad46c80b80f2098aae6614a7c2005a6b90 100644 GIT binary patch delta 21 dcmew%{YQF27L%UQ#;ofsOnOF}9a*}*2bLcESp_fw{rjhJ|_m* diff --git a/client/Maestro/Targets/FXPTargetProcessor.cs b/client/Maestro/Targets/FXPTargetProcessor.cs index bc1e62dc..1625b07d 100644 --- a/client/Maestro/Targets/FXPTargetProcessor.cs +++ b/client/Maestro/Targets/FXPTargetProcessor.cs @@ -29,7 +29,8 @@ namespace Maestro.Targets { try { sourceFTP = CreateClient(sourceConfig.Remote); - long ilength = sourceFTP.GetFileSize(inputUri.AbsolutePath); + string input = inputUri.AbsolutePath.Replace("%20", " "); + long ilength = sourceFTP.GetFileSize(input); if (parameters.TargetConfig.NexioServer) ilength = ilength / 2; @@ -50,7 +51,6 @@ namespace Maestro.Targets { if (!sourceReplyTYPE.Success) throw new Exception(sourceReplyTYPE.ErrorMessage); - string input = inputUri.AbsolutePath; if (input.LastIndexOf("/") == 0) input = input.Replace("/", ""); FtpReply replyRETR = sourceFTP.Execute("RETR " + input); diff --git a/client/OctopusClient/OctopusAPI.cs b/client/OctopusClient/OctopusAPI.cs index 7e4f8eaa..2c73ff1b 100644 --- a/client/OctopusClient/OctopusAPI.cs +++ b/client/OctopusClient/OctopusAPI.cs @@ -87,9 +87,10 @@ namespace OctopusClient { public IEnumerable GetRundowns(DateTime scheduledDate) { IEnumerable result = null; + logger.Debug("GetRundowns"); try { var request = new RestRequest("rundowns/{scheduledDate}", Method.GET); - var dt = scheduledDate.ToUniversalTime().ToString("s", CultureInfo.InvariantCulture); + var dt = scheduledDate.ToString("s", CultureInfo.CurrentCulture); request.AddParameter("scheduledDate", dt, ParameterType.UrlSegment); var response = client.Execute(request); if (response.ContentLength == 0) { diff --git a/client/OctopusClient/OctopusIDSelector.cs b/client/OctopusClient/OctopusIDSelector.cs index abf2ab5f..9b9718d1 100644 --- a/client/OctopusClient/OctopusIDSelector.cs +++ b/client/OctopusClient/OctopusIDSelector.cs @@ -112,7 +112,7 @@ namespace OctopusClient { Cursor.Current = Cursors.WaitCursor; IEnumerable rundowns = client.GetRundowns(dateScheduled.Value.Date)?.ToArray(); if (rundowns == null) { - bindingRundown.DataSource = null; + //bindingRundown.DataSource = null; Cursor.Current = Cursors.Default; return; } diff --git a/client/PlanAIRClient/TrafficIDSelector.cs b/client/PlanAIRClient/TrafficIDSelector.cs index 921d8aa5..01eb58e9 100644 --- a/client/PlanAIRClient/TrafficIDSelector.cs +++ b/client/PlanAIRClient/TrafficIDSelector.cs @@ -95,8 +95,10 @@ namespace TrafficClient { TrafficItem res = actualRow.DataBoundItem as TrafficItem; if (String.IsNullOrEmpty(res.MediaID)) { TrafficVersion v = trafficAPI.CreateMaterialVersion(res.EpisodeID); - res.MediaID = v.MediaID; - res.VariantID = v.VariantID; + if (v != null) { + res.MediaID = v.MediaID; + res.VariantID = v.VariantID; + } if (res.VariantID == 0 || String.IsNullOrEmpty(res.MediaID)) return; } diff --git a/client/PlanAIRClient/Workers/MaterialWorker.cs b/client/PlanAIRClient/Workers/MaterialWorker.cs index 01732efc..7a44a3ad 100644 --- a/client/PlanAIRClient/Workers/MaterialWorker.cs +++ b/client/PlanAIRClient/Workers/MaterialWorker.cs @@ -28,7 +28,7 @@ namespace TrafficClient.Workers { NextBroadcastDate = data.v_NextBroadcastDate, FirstBroadcastDate = data.v_FirstBroadcastDate, EpisodeID = data.v_EpisodeID, - OK = data.v_OkForAir != null && "OK".Equals(data.v_OkForAir) + OK = data.v_OkForAir != null && true.Equals(data.v_OkForAir) }; } @@ -153,7 +153,8 @@ namespace TrafficClient.Workers { cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@Operation", 1100); cmd.Parameters.AddWithValue("@@ItemID", itemID); - cmd.Parameters.AddWithValue("@@@Options", options); + cmd.Parameters.AddWithValue("@@@Options", DBNull.Value); + cmd.Parameters.AddWithValue("@@IntParam1", options); cmd.ExecuteNonQuery(); } } diff --git a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml index 53807a42..cc492ecc 100644 --- a/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml +++ b/server/user.jobengine.executors/jobtemplates/retrieve-ondemand.xml @@ -45,10 +45,10 @@ - + - + diff --git a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java index 2db2f3c9..3d04d264 100644 --- a/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java +++ b/server/user.jobengine.osgi.services/src/user/jobengine/osgi/rest/octopus/OctopusRESTService.java @@ -29,18 +29,41 @@ public class OctopusRESTService { logger.info("Created"); } + private Response createErrorResponse(Exception e) { + return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); + } + @GET - @Path("/test/{id}") + @Path("/getMosObjectsByID/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response test(@PathParam("id") Long jobId) { + public Response getMosObjectsByID(@PathParam("id") String id) { + logger.trace("Entry"); Response result = null; try { - String json = "{valami: " + jobId + " }"; - result = Response.ok(json).build(); + List mosObjects = octopusService.getMosObjectsByID(id); + result = Response.ok(mosObjects).build(); } catch (Exception e) { - result = Response.serverError().build(); + result = createErrorResponse(e); } + logger.trace("Exit"); + return result; + } + + @GET + @Path("/getRundownByStoryID/{id}") + @Consumes({ MediaType.APPLICATION_JSON }) + @Produces({ MediaType.APPLICATION_JSON }) + public Response getRundownByStoryID(@PathParam("id") String id) { + logger.trace("Entry"); + Response result = null; + try { + List rundowns = octopusService.getRundownByStoryID(Long.parseLong(id)); + result = Response.ok(rundowns).build(); + } catch (Exception e) { + result = createErrorResponse(e); + } + logger.trace("Exit"); return result; } @@ -57,7 +80,7 @@ public class OctopusRESTService { @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) public Response getRundowns(@PathParam("scheduledDate") String scheduledDate) { - logger.trace("Entry"); + logger.info("Entry {}", scheduledDate); Response result = null; try { Date calendar = null; @@ -77,15 +100,15 @@ public class OctopusRESTService { } @GET - @Path("/storyfolders") + @Path("/getRundownsByPlaceHolderId/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStoryFolders() { + public Response getRundownsByPlaceHolderId(@PathParam("id") String id) { logger.trace("Entry"); Response result = null; try { - List storyFolders = octopusService.getStoryFolders(); - result = Response.ok(storyFolders).build(); + List rundowns = octopusService.getRundownsByPlaceHolderId(id); + result = Response.ok(rundowns).build(); } catch (Exception e) { result = createErrorResponse(e); } @@ -93,36 +116,15 @@ public class OctopusRESTService { return result; } - private Response createErrorResponse(Exception e) { - return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(e.getMessage()).build(); - } - @GET - @Path("/stories/{rundownID}") - @Consumes({ MediaType.APPLICATION_JSON }) - @Produces({ MediaType.APPLICATION_JSON }) - public Response getStories(@PathParam("rundownID") long rundownID) { - logger.trace("Entry"); - Response result = null; - try { - List stories = octopusService.getStories(rundownID); - result = Response.ok(stories).build(); - } catch (Exception e) { - result = createErrorResponse(e); - } - logger.trace("Exit"); - return result; - } - - @GET - @Path("/storiesByStoryFolderID/{storyFolderID}") + @Path("/stories/") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStoriesByStoryFolderId(@PathParam("storyFolderID") long storyFolderID) { + public Response getStories() { logger.trace("Entry"); Response result = null; try { - List stories = octopusService.getStoriesByStoryFolderId(storyFolderID); + List stories = octopusService.getStories(); result = Response.ok(stories).build(); } catch (Exception e) { result = createErrorResponse(e); @@ -130,16 +132,16 @@ public class OctopusRESTService { logger.trace("Exit"); return result; } - + @GET - @Path("/stories/") + @Path("/stories/{rundownID}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStories() { + public Response getStories(@PathParam("rundownID") long rundownID) { logger.trace("Entry"); Response result = null; try { - List stories = octopusService.getStories(); + List stories = octopusService.getStories(rundownID); result = Response.ok(stories).build(); } catch (Exception e) { result = createErrorResponse(e); @@ -147,7 +149,7 @@ public class OctopusRESTService { logger.trace("Exit"); return result; } - + @GET @Path("/getStoriesByIDRegex/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @@ -164,84 +166,84 @@ public class OctopusRESTService { logger.trace("Exit"); return result; } - + @GET - @Path("/getMosObjectsByID/{id}") + @Path("/getStoriesByPlaceHolderId/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getMosObjectsByID(@PathParam("id") String id) { + public Response getStoriesByPlaceHolderId(@PathParam("id") String id) { logger.trace("Entry"); Response result = null; try { - List mosObjects = octopusService.getMosObjectsByID(id); - result = Response.ok(mosObjects).build(); + List stories = octopusService.getStoriesByPlaceHolderId(id); + result = Response.ok(stories).build(); } catch (Exception e) { result = createErrorResponse(e); } logger.trace("Exit"); return result; } - + @GET - @Path("/getStoryFolders/{id}") + @Path("/storiesByStoryFolderID/{storyFolderID}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStoryFoldersByStoryID(@PathParam("id") String id) { + public Response getStoriesByStoryFolderId(@PathParam("storyFolderID") long storyFolderID) { logger.trace("Entry"); Response result = null; try { - List storyFolders = octopusService.getStoryFolders(Long.parseLong(id)); - result = Response.ok(storyFolders).build(); + List stories = octopusService.getStoriesByStoryFolderId(storyFolderID); + result = Response.ok(stories).build(); } catch (Exception e) { result = createErrorResponse(e); } logger.trace("Exit"); return result; } - + @GET - @Path("/getRundownByStoryID/{id}") + @Path("/storyfolders") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getRundownByStoryID(@PathParam("id") String id) { + public Response getStoryFolders() { logger.trace("Entry"); Response result = null; try { - List rundowns = octopusService.getRundownByStoryID(Long.parseLong(id)); - result = Response.ok(rundowns).build(); + List storyFolders = octopusService.getStoryFolders(); + result = Response.ok(storyFolders).build(); } catch (Exception e) { result = createErrorResponse(e); } logger.trace("Exit"); return result; } - + @GET - @Path("/getRundownsByPlaceHolderId/{id}") + @Path("/getStoryFoldersByPlaceHolderId/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getRundownsByPlaceHolderId(@PathParam("id") String id) { + public Response getStoryFoldersByPlaceHolderId(@PathParam("id") String id) { logger.trace("Entry"); Response result = null; try { - List rundowns = octopusService.getRundownsByPlaceHolderId(id); - result = Response.ok(rundowns).build(); + List storyFolders = octopusService.getStoryFoldersByPlaceHolderId(id); + result = Response.ok(storyFolders).build(); } catch (Exception e) { result = createErrorResponse(e); } logger.trace("Exit"); return result; } - + @GET - @Path("/getStoryFoldersByPlaceHolderId/{id}") + @Path("/getStoryFolders/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStoryFoldersByPlaceHolderId(@PathParam("id") String id) { + public Response getStoryFoldersByStoryID(@PathParam("id") String id) { logger.trace("Entry"); Response result = null; try { - List storyFolders = octopusService.getStoryFoldersByPlaceHolderId(id); + List storyFolders = octopusService.getStoryFolders(Long.parseLong(id)); result = Response.ok(storyFolders).build(); } catch (Exception e) { result = createErrorResponse(e); @@ -249,21 +251,19 @@ public class OctopusRESTService { logger.trace("Exit"); return result; } - + @GET - @Path("/getStoriesByPlaceHolderId/{id}") + @Path("/test/{id}") @Consumes({ MediaType.APPLICATION_JSON }) @Produces({ MediaType.APPLICATION_JSON }) - public Response getStoriesByPlaceHolderId(@PathParam("id") String id) { - logger.trace("Entry"); + public Response test(@PathParam("id") Long jobId) { Response result = null; try { - List stories = octopusService.getStoriesByPlaceHolderId(id); - result = Response.ok(stories).build(); + String json = "{valami: " + jobId + " }"; + result = Response.ok(json).build(); } catch (Exception e) { - result = createErrorResponse(e); + result = Response.serverError().build(); } - logger.trace("Exit"); return result; } } \ No newline at end of file -- 2.54.0