Merge pull request #518 from marle3003/develop

v0.14.5

Author: marle3003

acceptance/petstore_test.go

@@ -66,7 +66,8 @@ func (suite *PetStoreSuite) TestApi() {
 				"bindings":    map[string]interface{}{"partitions": float64(2), "segmentMs": float64(30000), "valueSchemaValidation": true},
 				"description": "",
 				"messages": map[string]interface{}{
-					"#/components/messages/order": map[string]interface{}{
+					"order": map[string]interface{}{
+						"name":        "order",
 						"contentType": "application/json",
 						"header": map[string]interface{}{
 							"schema": map[string]interface{}{
@@ -274,6 +275,6 @@ func (suite *PetStoreSuite) TestKafkaEventAndMetrics() {
 	// test kafka events, header added by JavaScript event handler
 	try.GetRequest(suite.T(), fmt.Sprintf("http://127.0.0.1:%s/api/events?namespace=kafka", suite.cfg.Api.Port), nil,
 		try.BodyContains(`"headers":{"foo":{"value":"bar","binary":"YmFy"}`),
-		try.BodyContains(`"messageId":"#/components/messages/order"`),
+		try.BodyContains(`"messageId":"order"`),
 	)
 }

api/handler_kafka.go

@@ -254,6 +254,9 @@ func newTopic(s *store.Store, t *store.Topic, ch *asyncapi3.Channel, cfg *asynca
 			Description: msg.Description,
 			ContentType: msg.ContentType,
 		}
+		if m.Name == "" {
+			m.Name = messageId
+		}
 
 		if msg.Payload != nil && msg.Payload.Value != nil {
 			m.Payload = &schemaInfo{Schema: msg.Payload.Value.Schema, Format: msg.Payload.Value.Format}

api/handler_kafka_test.go

@@ -145,7 +145,7 @@ func TestHandler_Kafka(t *testing.T) {
 				}))
 			},
 			requestUrl:   "http://foo.api/api/services/kafka/foo",
-			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"payload":{"schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
+			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"name":"foo","payload":{"schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
 		},
 		{
 			name: "get specific with topic and multi schema format",
@@ -168,7 +168,7 @@ func TestHandler_Kafka(t *testing.T) {
 				}))
 			},
 			requestUrl:   "http://foo.api/api/services/kafka/foo",
-			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"payload":{"format":"foo","schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
+			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"name":"foo","payload":{"format":"foo","schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
 		},
 		{
 			name: "get specific with group",
@@ -268,7 +268,7 @@ func TestHandler_Kafka(t *testing.T) {
 				return app
 			},
 			requestUrl:   "http://foo.api/api/services/kafka/foo",
-			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"payload":{"format":"foo","schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
+			responseBody: `{"name":"foo","description":"bar","version":"1.0","topics":[{"name":"foo","description":"bar","partitions":[{"id":0,"startOffset":0,"offset":0,"leader":{"name":"","addr":""},"segments":0}],"messages":{"foo":{"name":"foo","payload":{"format":"foo","schema":{"type":"string"}},"contentType":"application/json"}},"bindings":{"partitions":1,"valueSchemaValidation":true}}]}`,
 		},
 	}
 

api/handler_schema.go

@@ -132,6 +132,7 @@ func encodeExample(v interface{}, schema interface{}, schemaFormat string, conte
 		case ct.Key() == "text/plain":
 		case ct.Key() == "avro/binary" && isAvro(schemaFormat):
 		case ct.Key() == "application/octet-stream" && isAvro(schemaFormat):
+		case ct.Key() == "application/avro" && isAvro(schemaFormat):
 		case ct.IsAny():
 			ct = media.ParseContentType("application/json")
 		default:
@@ -151,7 +152,7 @@ func encodeExample(v interface{}, schema interface{}, schemaFormat string, conte
 			switch {
 			case ct.Subtype == "json":
 				data, err = encoding.NewEncoder(t.Convert()).Write(v, ct)
-			case ct.Key() == "avro/binary" || ct.Key() == "application/octet-stream":
+			case ct.Key() == "avro/binary" || ct.Key() == "application/avro" || ct.Key() == "application/octet-stream":
 				data, err = t.Marshal(v)
 			default:
 				examples = append(examples, example{

api/handler_schema_asyncapi.go

@@ -86,7 +86,7 @@ func getAsyncApiExample(w http.ResponseWriter, r *http.Request, cfg *asyncapi3.C
 		switch {
 		case ct.Subtype == "json":
 			data, err = encoding.NewEncoder(t.Convert()).Write(rnd, ct)
-		case ct.Key() == "avro/binary" || ct.Key() == "application/octet-stream":
+		case ct.Key() == "avro/binary" || ct.Key() == "application/avro" || ct.Key() == "application/octet-stream":
 			data, err = t.Marshal(rnd)
 		default:
 			http.Error(w, fmt.Sprintf("unsupported schema type: %T", t), http.StatusBadRequest)

api/handler_schema_validate.go

@@ -29,7 +29,7 @@ func (h *handler) validate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if !(valReq.ContentType.Subtype == "json" || valReq.ContentType.Subtype == "xml" || valReq.ContentType.Key() == "avro/binary") {
+	if !(valReq.ContentType.Subtype == "json" || valReq.ContentType.Subtype == "xml" || valReq.ContentType.Key() == "avro/binary" || valReq.ContentType.Key() == "application/avro") {
 		http.Error(w, fmt.Sprintf("content-type %v not supported. Only json or xml are supported", valReq.ContentType), http.StatusBadRequest)
 		return
 	}

config/dynamic/asyncApi/convert.go

@@ -62,6 +62,9 @@ func convertChannels(cfg *asyncapi3.Config, channels map[string]*ChannelRef) err
 	}
 
 	for name, orig := range channels {
+		if orig == nil {
+			continue
+		}
 		if len(orig.Ref) > 0 {
 			cfg.Channels[name] = &asyncapi3.ChannelRef{Reference: dynamic.Reference{Ref: orig.Ref}}
 		}
@@ -123,10 +126,12 @@ func addMessage(target *asyncapi3.Channel, msg *asyncapi3.MessageRef, opId, ref,
 	var msgId string
 	if len(opId) > 0 {
 		msgId = opId
-	} else if len(ref) > 0 {
+	} else if msg.Ref != "" {
+		msgId = path.Base(msg.Ref)
+	} else if ref != "" {
 		msgId = path.Base(ref)
 	} else if len(opName) > 0 {
-		msgId = opName
+		msgId = path.Base(opName)
 	}
 
 	target.Messages[msgId] = msg

config/dynamic/asyncApi/convert_test.go

@@ -47,6 +47,7 @@ func TestConfig_Convert(t *testing.T) {
 	require.Equal(t, "The topic on which measured values may be produced and consumed.", channel.Description)
 	param := channel.Parameters["streetlightId"].Value
 	require.Equal(t, "The ID of the streetlight.", param.Description)
+	require.Contains(t, channel.Messages, "receiveLightMeasurement")
 
 	// message
 	msg := channel.Messages["receiveLightMeasurement"].Value

config/dynamic/resolve.go

@@ -239,7 +239,7 @@ func resolveResource(ref string, element interface{}, config *Config, reader Rea
 		AddRef(config, sub)
 		if _, ok := sub.Data.(Parser); ok && len(sub.Raw) > 0 {
 			// parse again with parent scope hierarchy
-			sub = &Config{Raw: sub.Raw, Data: sub.Data, Info: sub.Info}
+			sub = &Config{Raw: sub.Raw, Data: copyData(sub.Data), Info: sub.Info}
 			sub.Scope.SetParent(config.Scope)
 			err = Parse(sub, reader)
 			if err != nil {
@@ -300,3 +300,20 @@ func setResolved(element interface{}, val interface{}) (err error) {
 
 	return
 }
+
+func copyData(input interface{}) interface{} {
+	val := reflect.ValueOf(input)
+
+	if val.Kind() != reflect.Ptr {
+		// Not a pointer — return the original or handle differently
+		return input
+	}
+
+	// Create a new object of the same type
+	c := reflect.New(val.Elem().Type())
+
+	// Set the value of the new object to the original
+	c.Elem().Set(val.Elem())
+
+	return c.Interface()
+}

docs/guides/smtp/overview.md

@@ -10,9 +10,16 @@ your mailbox. You can also use different email addresses for testing, not just y
 This example demonstrates how to configure an SMTP server listen on port 587 on all available
 ip address.
 
-```yaml
+```yaml tab=smtp
 smtp: '1.0'
 info:
   title: Mokapi's Mail Server
 server: smtp://:587
+```
+
+```yaml tab=smtps
+smtp: '1.0'
+info:
+  title: Mokapi's Mail Server
+server: smtps://:587
 ```