Revert object

codescan/application_test.go

@@ -5,9 +5,7 @@ import (
 	"testing"
 
 	"github.com/go-openapi/spec"
-
 	"github.com/stretchr/testify/assert"
-
 	"github.com/stretchr/testify/require"
 )
 
@@ -47,7 +45,7 @@ func loadClassificationPkgsCtx(t testing.TB, extra ...string) *scanCtx {
 func TestApplication_LoadCode(t *testing.T) {
 	sctx := loadClassificationPkgsCtx(t)
 	require.NotNil(t, sctx)
-	require.Len(t, sctx.app.Models, 32)
+	require.Len(t, sctx.app.Models, 31)
 	require.Len(t, sctx.app.Meta, 1)
 	require.Len(t, sctx.app.Routes, 7)
 	require.Empty(t, sctx.app.Operations)

codescan/parser.go

@@ -251,8 +251,6 @@ func swaggerSchemaForType(typeName string, prop swaggerTypable) error {
 		prop.Typed("integer", "uint8")
 	case "uintptr":
 		prop.Typed("integer", "uint64")
-	case "object":
-		prop.Typed("object", "")
 	default:
 		return fmt.Errorf("unsupported type %q", typeName)
 	}

codescan/schema.go

@@ -354,11 +354,6 @@ func (s *schemaBuilder) buildFromType(tpe types.Type, tgt swaggerTypable) error
 			cmt = new(ast.CommentGroup)
 		}
 
-		if typeName, ok := typeName(cmt); ok {
-			_ = swaggerSchemaForType(typeName, tgt)
-			return nil
-		}
-
 		if s.decl.Spec.Assign.IsValid() {
 			return s.buildFromType(titpe.Underlying(), tgt)
 		}
@@ -476,6 +471,7 @@ func (s *schemaBuilder) buildFromType(tpe types.Type, tgt swaggerTypable) error
 
 func (s *schemaBuilder) buildFromInterface(decl *entityDecl, it *types.Interface, schema *spec.Schema, seen map[string]string) error {
 	if it.Empty() {
+		schema.Typed("object", "")
 		return nil
 	}
 

codescan/schema_test.go

@@ -670,7 +670,7 @@ func TestInterfaceField(t *testing.T) {
 	require.NoError(t, prs.Build(models))
 
 	schema := models["Interfaced"]
-	assertProperty(t, &schema, "", "custom_data", "", "CustomData")
+	assertProperty(t, &schema, "object", "custom_data", "", "CustomData")
 }
 
 func TestAliasedTypes(t *testing.T) {
@@ -833,21 +833,6 @@ func TestEmbeddedAllOf(t *testing.T) {
 	assertProperty(t, &asch, "string", "cat", "", "Cat")
 }
 
-func TestSwaggerTypeNamed(t *testing.T) {
-	sctx := loadClassificationPkgsCtx(t)
-	decl := getClassificationModel(sctx, "NamedWithType")
-	require.NotNil(t, decl)
-	prs := &schemaBuilder{
-		ctx:  sctx,
-		decl: decl,
-	}
-	models := make(map[string]spec.Schema)
-	require.NoError(t, prs.Build(models))
-	schema := models["namedWithType"]
-
-	assertProperty(t, &schema, "object", "some_map", "", "SomeMap")
-}
-
 func TestSwaggerTypeStruct(t *testing.T) {
 	sctx := loadClassificationPkgsCtx(t)
 	decl := getClassificationModel(sctx, "NullString")

fixtures/goparsing/classification/models/nomodel.go

@@ -18,8 +18,8 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/go-openapi/strfmt"
 	"github.com/cloudentity/go-swagger/fixtures/goparsing/classification/transitive/mods"
+	"github.com/go-openapi/strfmt"
 )
 
 // NoModel is a struct without an annotation.
@@ -753,11 +753,3 @@ type TextMarshalModel struct {
 	StructStrfmtPtr *MarshalTextStructStrfmtPtr `json:"structStrfmtPtr"`
 	CustomURL       URL                         `json:"customUrl"`
 }
-
-// swagger:type object
-type SomeObjectMap interface{}
-
-// swagger:model namedWithType
-type NamedWithType struct {
-	SomeMap SomeObjectMap `json:"some_map"`
-}