Skip to content

Commit 2770737

Browse files
🐛 pass build tool when using pipe mode (#961)
<!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Chores** * Updated analyzer-lsp dependency to version 0.8.1-alpha. * **Refactor** * Deferred client initialization until after project resolution and build tool setup to improve startup ordering and error handling. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Signed-off-by: Pranav Gaikwad <[email protected]> Signed-off-by: Shawn Hurley <[email protected]> Co-authored-by: Shawn Hurley <[email protected]>
1 parent 8753c07 commit 2770737

2 files changed

Lines changed: 17 additions & 15 deletions

File tree

external-providers/java-external-provider/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.9
44

55
require (
66
github.com/go-logr/logr v1.4.3
7-
github.com/konveyor/analyzer-lsp v0.7.0-alpha.2.0.20250625194402-05dca9b4ac43
7+
github.com/konveyor/analyzer-lsp v0.8.1-alpha.2.0.20251107235035-7470a4a226f4
88
github.com/swaggest/openapi-go v0.2.58
99
go.lsp.dev/uri v0.3.0
1010
gopkg.in/yaml.v2 v2.4.0

external-providers/java-external-provider/pkg/java_external_provider/provider.go

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,6 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
231231
p.encoding = provider.GetEncodingFromConfig(config)
232232
log = log.WithValues("provider", "java").WithValues("analysis-mode", mode).WithValues("project", config.Location)
233233

234-
if config.RPC != nil {
235-
return &javaServiceClient{
236-
rpc: config.RPC,
237-
config: config,
238-
log: log,
239-
depsLocationCache: make(map[string]int),
240-
includedPaths: provider.GetIncludedPathsFromConfig(config, false),
241-
}, provider.InitConfig{}, nil
242-
}
243-
244234
// read provider settings
245235
bundlesString, ok := config.ProviderSpecificConfig[BUNDLES_INIT_OPTION].(string)
246236
if !ok {
@@ -277,10 +267,7 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
277267
mavenInsecure = false
278268
}
279269

280-
lspServerPath, ok := config.ProviderSpecificConfig[provider.LspServerPathConfigKey].(string)
281-
if !ok || lspServerPath == "" {
282-
return nil, additionalBuiltinConfig, fmt.Errorf("invalid lspServerPath provided, unable to init java provider")
283-
}
270+
lspServerPath, _ := config.ProviderSpecificConfig[provider.LspServerPathConfigKey].(string)
284271
fernflower, ok := config.ProviderSpecificConfig[FERN_FLOWER_INIT_OPTION].(string)
285272
if !ok {
286273
fernflower = "/bin/fernflower.jar"
@@ -346,6 +333,21 @@ func (p *javaProvider) Init(ctx context.Context, log logr.Logger, config provide
346333
config.DependencyPath = depLocation
347334
}
348335

336+
if config.RPC != nil {
337+
return &javaServiceClient{
338+
rpc: config.RPC,
339+
config: config,
340+
log: log,
341+
depsLocationCache: make(map[string]int),
342+
includedPaths: provider.GetIncludedPathsFromConfig(config, false),
343+
buildTool: buildTool,
344+
mvnIndexPath: mavenIndexPath,
345+
mvnSettingsFile: mavenSettingsFile,
346+
}, provider.InitConfig{}, nil
347+
} else if lspServerPath == "" {
348+
return nil, additionalBuiltinConfig, fmt.Errorf("invalid lspServerPath provided, unable to init java provider")
349+
}
350+
349351
additionalBuiltinConfig.Location = config.Location
350352
additionalBuiltinConfig.DependencyPath = config.DependencyPath
351353

0 commit comments

Comments
 (0)