X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dmaap-mediator-producer%2Finternal%2Fjobs%2Fjobs.go;h=86bfe05c334963d13fda4744aacd59d7923dbefe;hb=3b2f07a98d1d5e2f83aaf05fede3f07379d48b88;hp=0bf2f12a06d709ce4d445963078f7737e82cdcaf;hpb=db7b5c801bdc96889aea18ab190f2b72fa8d8e06;p=nonrtric.git

diff --git a/dmaap-mediator-producer/internal/jobs/jobs.go b/dmaap-mediator-producer/internal/jobs/jobs.go
index 0bf2f12a..86bfe05c 100644
--- a/dmaap-mediator-producer/internal/jobs/jobs.go
+++ b/dmaap-mediator-producer/internal/jobs/jobs.go
@@ -51,7 +51,7 @@ type JobInfo struct {
 	InfoJobData      Parameters `json:"info_job_data"`
 	InfoTypeIdentity string     `json:"info_type_identity"`
 	sourceType       sourceType
-}
+} // @name JobInfo
 
 type JobTypesManager interface {
 	LoadTypesFromConfiguration(types []config.TypeDefinition) []config.TypeDefinition
@@ -327,12 +327,12 @@ func newJob(j JobInfo, c restclient.HTTPClient) job {
 
 type Parameters struct {
 	BufferTimeout BufferTimeout `json:"bufferTimeout"`
-}
+} // @name Parameters
 
 type BufferTimeout struct {
 	MaxSize            int   `json:"maxSize"`
 	MaxTimeMiliseconds int64 `json:"maxTimeMiliseconds"`
-}
+} // @name BufferTimeout
 
 func (j *job) start() {
 	if j.isJobBuffered() {
@@ -399,15 +399,30 @@ func (j *job) read(bufferParams BufferTimeout) []byte {
 }
 
 func getAsJSONArray(rawMsgs [][]byte) []byte {
-	json := `"[`
+	if len(rawMsgs) == 0 {
+		return []byte("")
+	}
+	strings := ""
 	for i := 0; i < len(rawMsgs); i++ {
-		msg := string(rawMsgs[i])
-		json = json + strings.ReplaceAll(msg, "\"", "\\\"")
-		if i < len(rawMsgs)-1 {
-			json = json + ","
-		}
+		strings = strings + makeIntoString(rawMsgs[i])
+		strings = addSeparatorIfNeeded(strings, i, len(rawMsgs))
+	}
+	return []byte(wrapInJSONArray(strings))
+}
+
+func makeIntoString(rawMsg []byte) string {
+	return `"` + strings.ReplaceAll(string(rawMsg), "\"", "\\\"") + `"`
+}
+
+func addSeparatorIfNeeded(strings string, position, length int) string {
+	if position < length-1 {
+		strings = strings + ","
 	}
-	return []byte(json + `]"`)
+	return strings
+}
+
+func wrapInJSONArray(strings string) string {
+	return "[" + strings + "]"
 }
 
 func (j *job) waitTimeout(wg *sync.WaitGroup, timeout time.Duration) bool {