Skip to content

Commit 7b20cf0

Browse files
committed
fix spelling mistakes and upgrade embedded SootWrapper
1 parent 560541c commit 7b20cf0

19 files changed

+42
-26
lines changed
File renamed without changes.

internal/callgraph/language/java11/callgraph.go renamed to internal/callgraph/language/java/callgraph.go

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,10 @@
11
package java
22

33
import (
4-
"embed"
5-
"path/filepath"
6-
74
"github.com/debricked/cli/internal/callgraph/cgexec"
85
ioFs "github.com/debricked/cli/internal/io"
96
)
107

11-
//go:embed embeded/SootWrapper.jar
12-
var jarCallGraph embed.FS
13-
148
type ICallgraph interface {
159
RunCallGraphWithSetup() error
1610
RunCallGraph(callgraphJarPath string) error
@@ -47,26 +41,13 @@ func NewCallgraph(
4741
}
4842

4943
func (cg *Callgraph) RunCallGraphWithSetup() error {
50-
jarFile, err := cg.filesystem.FsOpenEmbed(jarCallGraph, "embeded/SootWrapper.jar")
51-
if err != nil {
52-
return err
53-
}
54-
defer cg.filesystem.FsCloseFile(jarFile)
55-
5644
tempDir, err := cg.filesystem.MkdirTemp("jar")
5745
if err != nil {
5846
return err
5947
}
6048
defer cg.filesystem.RemoveAll(tempDir)
61-
tempJarFile := filepath.Join(tempDir, "SootWrapper.jar")
62-
63-
jarBytes, err := cg.filesystem.FsReadAll(jarFile)
64-
if err != nil {
65-
66-
return err
67-
}
6849

69-
err = cg.filesystem.FsWriteFile(tempJarFile, jarBytes, 0600)
50+
tempJarFile, err := initializeSootWrapper(cg.filesystem, tempDir)
7051
if err != nil {
7152

7253
return err

internal/callgraph/language/java11/callgraph_test.go renamed to internal/callgraph/language/java/callgraph_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"testing"
66

7-
"github.com/debricked/cli/internal/callgraph/language/java11/testdata"
7+
"github.com/debricked/cli/internal/callgraph/language/java/testdata"
88
ioTestData "github.com/debricked/cli/internal/io/testdata"
99
"github.com/stretchr/testify/assert"
1010
)
File renamed without changes.
File renamed without changes.

internal/callgraph/language/java11/embeded/SootWrapper.jar renamed to internal/callgraph/language/java/embedded/SootWrapper.jar

18.1 MB
Binary file not shown.

internal/callgraph/language/java11/embeded/gradle-script.groovy renamed to internal/callgraph/language/java/embedded/gradle-script.groovy

File renamed without changes.

internal/callgraph/language/java11/job_test.go renamed to internal/callgraph/language/java/job_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
ctxTestdata "github.com/debricked/cli/internal/callgraph/cgexec/testdata"
1111
conf "github.com/debricked/cli/internal/callgraph/config"
1212
jobTestdata "github.com/debricked/cli/internal/callgraph/job/testdata"
13-
"github.com/debricked/cli/internal/callgraph/language/java11/testdata"
13+
"github.com/debricked/cli/internal/callgraph/language/java/testdata"
1414
io "github.com/debricked/cli/internal/io"
1515
ioTestData "github.com/debricked/cli/internal/io/testdata"
1616
"github.com/stretchr/testify/assert"
File renamed without changes.

0 commit comments

Comments
 (0)