Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/handler/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func InstallTemplate() http.HandlerFunc {
// Helper to send SSE events
sendSSE := func(event InstallProgressEvent) {
data, _ := json.Marshal(event)
fmt.Fprintf(w, "data: %s\n\n", data)
_, _ = fmt.Fprintf(w, "data: %s\n\n", data)
flusher.Flush()
}

Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/filters/filterjava/java_async_return.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func ToAsyncReturnString(prefix string, schema *objmodel.Schema) (string, error)
text = fmt.Sprintf("%s%s", prefix, common.CamelTitleCase(s_imported.Name))
case objmodel.TypeExtern:
xe := parseJavaExtern(schema)
text = fmt.Sprintf("new %s()", xe.Name)
var java_module string
java_module = ""
if xe.Package != "" {
Expand Down
4 changes: 0 additions & 4 deletions pkg/codegen/filters/filterjava/java_default.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ func ToDefaultString(schema *objmodel.Schema, prefix string) (string, error) {
text = fmt.Sprintf("new %s%s()", prefix, s_imported.Name)
case objmodel.TypeExtern:
xe := parseJavaExtern(schema)
text = fmt.Sprintf("new %s()", xe.Name)
if xe.Default != "" {
text = xe.Default
} else {
Expand All @@ -135,9 +134,6 @@ func ToDefaultString(schema *objmodel.Schema, prefix string) (string, error) {
return "xxx", fmt.Errorf("javaDefault interface not found: %s", schema.Dump())
}
// if interface is local it is found both as s_local and s_imported
if i_local == nil {
prefix = fmt.Sprintf("%s.%s_impl.", common.CamelLowerCase(i_imported.Module.Name), common.CamelLowerCase(i_imported.Module.Name))
}
text = "null"
default:
return "xxx", fmt.Errorf("javaDefault unknown schema %s", schema.Dump())
Expand Down
3 changes: 0 additions & 3 deletions pkg/codegen/filters/filterjava/java_element_type.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ func ToElementTypeString(prefix string, schema *objmodel.Schema) (string, error)
case objmodel.TypeBool:
text = "boolean"
case objmodel.TypeEnum:
symbol := schema.GetEnum()
text = fmt.Sprintf("%s%s", prefix, symbol.Name)
e_local := schema.LookupEnum("", schema.Type)
e_imported := schema.LookupEnum(schema.Import, schema.Type)
if e_local == nil && e_imported == nil {
Expand All @@ -56,7 +54,6 @@ func ToElementTypeString(prefix string, schema *objmodel.Schema) (string, error)
text = fmt.Sprintf("%s%s", prefix, common.CamelTitleCase(s_imported.Name))
case objmodel.TypeExtern:
xe := parseJavaExtern(schema)
text = fmt.Sprintf("new %s()", xe.Name)
var java_module string
java_module = ""
if xe.Package != "" {
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/filters/filterjava/java_return.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ func ToReturnString(prefix string, schema *objmodel.Schema) (string, error) {
text = fmt.Sprintf("%s%s", prefix, common.CamelTitleCase(s_imported.Name))
case objmodel.TypeExtern:
xe := parseJavaExtern(schema)
text = fmt.Sprintf("new %s()", xe.Name)
var java_module string
java_module = ""
if xe.Package != "" {
Expand Down
1 change: 0 additions & 1 deletion pkg/codegen/filters/filterjava/java_test_value.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ func ToTestValueString(prefix string, schema *objmodel.Schema) (string, error) {
text = fmt.Sprintf("new %s%s()", prefix, s_imported.Name)
case objmodel.TypeExtern:
xe := parseJavaExtern(schema)
text = fmt.Sprintf("new %s()", xe.Name)
if xe.Default != "" {
text = xe.Default
} else {
Expand Down
7 changes: 2 additions & 5 deletions pkg/codegen/filters/filterjni/jni_java_signature_param.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ func jniSignatureType(node *objmodel.TypedNode) (string, error) {
}
case objmodel.TypeExtern:
xe := filterjava.MakeJavaExtern(&node.Schema)
var java_module string
java_module = ""
if xe.Package != "" {
java_module = xe.Package
java_module := xe.Package
java_module = common.Replace(java_module, ".", "/")
text = "L" + java_module + "/" + xe.Name + ";"
} else {
Expand All @@ -69,8 +67,7 @@ func jniSignatureType(node *objmodel.TypedNode) (string, error) {
case objmodel.TypeInterface:
i := node.LookupInterface(node.Import, node.Type)
if i != nil {
var name string
name = "I" + i.Name
name := "I" + i.Name
text = makeFullTypeName(i.Module.Name, name)
} else {
return "xxx", fmt.Errorf("ToSignatureType interface not found %s", node.Dump())
Expand Down
8 changes: 4 additions & 4 deletions pkg/foundation/config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ func TestNewConfig(t *testing.T) {
dir := t.TempDir()
customCacheDir := filepath.Join(dir, "custom-cache")

os.Setenv("APIGEAR_CACHE_DIR", customCacheDir)
defer os.Unsetenv("APIGEAR_CACHE_DIR")
_ = os.Setenv("APIGEAR_CACHE_DIR", customCacheDir)
defer func() { _ = os.Unsetenv("APIGEAR_CACHE_DIR") }()

cfg, err := NewConfig(dir)
require.NoError(t, err)
Expand All @@ -90,8 +90,8 @@ func TestNewConfig(t *testing.T) {
dir := t.TempDir()
customRegistryDir := filepath.Join(dir, "custom-registry")

os.Setenv("APIGEAR_REGISTRY_DIR", customRegistryDir)
defer os.Unsetenv("APIGEAR_REGISTRY_DIR")
_ = os.Setenv("APIGEAR_REGISTRY_DIR", customRegistryDir)
defer func() { _ = os.Unsetenv("APIGEAR_REGISTRY_DIR") }()

cfg, err := NewConfig(dir)
require.NoError(t, err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/objmodel/spec/schema_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,13 @@ func TestLoadSchema(t *testing.T) {

t.Run("panics for unknown document type", func(t *testing.T) {
assert.Panics(t, func() {
LoadSchema(DocumentTypeUnknown)
_, _ = LoadSchema(DocumentTypeUnknown)
})
})

t.Run("panics for invalid document type", func(t *testing.T) {
assert.Panics(t, func() {
LoadSchema(DocumentType("invalid"))
_, _ = LoadSchema(DocumentType("invalid"))
})
})
}
Expand Down
12 changes: 6 additions & 6 deletions pkg/runtime/events/stub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ func TestStubEventBusImplementsInterface(t *testing.T) {
// TestStubEventBusPublish verifies Publish is a no-op
func TestStubEventBusPublish(t *testing.T) {
bus := NewStubEventBus()
defer bus.Close()
defer func() { _ = bus.Close() }()

e := NewEvent("test.event", map[string]any{"key": "value"})
err := bus.Publish(e)
Expand All @@ -25,7 +25,7 @@ func TestStubEventBusPublish(t *testing.T) {
// TestStubEventBusRequest verifies Request returns an error event
func TestStubEventBusRequest(t *testing.T) {
bus := NewStubEventBus()
defer bus.Close()
defer func() { _ = bus.Close() }()

e := NewEvent("test.request", map[string]any{"key": "value"})
resp, err := bus.Request(e)
Expand All @@ -50,7 +50,7 @@ func TestStubEventBusRequest(t *testing.T) {
// TestStubEventBusRegister verifies Register is a no-op
func TestStubEventBusRegister(t *testing.T) {
bus := NewStubEventBus()
defer bus.Close()
defer func() { _ = bus.Close() }()

called := false
handler := func(e *Event) (*Event, error) {
Expand All @@ -70,7 +70,7 @@ func TestStubEventBusRegister(t *testing.T) {
// TestStubEventBusUse verifies Use is a no-op
func TestStubEventBusUse(t *testing.T) {
bus := NewStubEventBus()
defer bus.Close()
defer func() { _ = bus.Close() }()

called := false
middleware := func(e *Event) (*Event, error) {
Expand Down Expand Up @@ -106,14 +106,14 @@ func TestStubEventBusClose(t *testing.T) {
// TestStubEventBusConcurrency verifies thread safety
func TestStubEventBusConcurrency(t *testing.T) {
bus := NewStubEventBus()
defer bus.Close()
defer func() { _ = bus.Close() }()

// Run operations concurrently to check for race conditions
done := make(chan bool, 3)

go func() {
for i := 0; i < 100; i++ {
bus.Publish(NewEvent("test", nil))
_ = bus.Publish(NewEvent("test", nil))
}
done <- true
}()
Expand Down