Commitb54b74a

committed

impl: prefer agent name over agent id in URI handler

Agent name is easier to resolve in jetbrains gateway module

1 parent546d317 commitb54b74aCopy full SHA for b54b74a

File tree

+11

-11

lines changed

+11

-11

lines changed

Lines changed: 10 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -327,17 +327,16 @@ internal fun getMatchingAgent(`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`// If the agent is missing and the workspace has only one, use that.`
`330`		`-// Prefer the ID over the name if both are set.`
`331`		`-val agent=`
`332`		`-if (!parameters.agentID().isNullOrBlank()) {`
`333`		`- agents.firstOrNull { it.id.toString()== parameters.agentID() }`
`334`		`- }elseif (!parameters.agentName().isNullOrBlank()) {`
`335`		`- agents.firstOrNull { it.name== parameters.agentName() }`
`336`		`- }elseif (agents.size==1) {`
`337`		`- agents.first()`
`338`		`- }else {`
`339`		`-null`
`340`		`- }`
	`330`	`+// Prefer the name over the id if both are set.`
	`331`	`+val agent=if (!parameters.agentName().isNullOrBlank()) {`
	`332`	`+ agents.firstOrNull { it.name== parameters.agentName() }`
	`333`	`+ }elseif (!parameters.agentID().isNullOrBlank()) {`
	`334`	`+ agents.firstOrNull { it.id.toString()== parameters.agentID() }`
	`335`	`+ }elseif (agents.size==1) {`
	`336`	`+ agents.first()`
	`337`	`+ }else {`
	`338`	`+null`
	`339`	`+ }`
`341`	`340`
`342`	`341`	`if (agent==null) {`
`343`	`342`	`if (!parameters.agentID().isNullOrBlank()) {`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ fun Map<String, String>.owner() = this[OWNER]`
`29`	`29`
`30`	`30`	`funMap<String,String?>.agentName()=this[AGENT_NAME]`
`31`	`31`
	`32`	`+@Deprecated("Use the agent name instead")`
`32`	`33`	`funMap<String,String?>.agentID()=this[AGENT_ID]`
`33`	`34`
`34`	`35`	`funMap<String,String>.folder()=this[FOLDER]`

Comments

(0)