Skip to content

refactor(usecases): rewrite pre-2018 ref-patterns to match ergonomics #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jhamill34 merged 2 commits into from
Aug 26, 2026
Merged

refactor(usecases): rewrite pre-2018 ref-patterns to match ergonomics #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f510733
refactor(usecases): rewrite pre-2018 ref-patterns to match ergonomics
claude Aug 26, 2026
b3851b5
refactor(service_loader): fix a &mut/ref mut site missed in the first…
claude Aug 26, 2026
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
20 changes: 10 additions & 10 deletions usecases/execution_engine/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ impl Engine {
// ScriptedAction -> ScriptRunner

if identifier == "$input" {
if let &Some(ref input_handler) = &self.input_handler {
if let Some(input_handler) = &self.input_handler {
return input_handler.run(params, context);
}

Expand All @@ -209,8 +209,8 @@ impl Engine {
let manifest = service.manifest.v2();

let result = match &manifest.value {
&Some(service_manifest_latest::Value::Swagger(ref swagger)) => {
if let &Some(ref connector) = &self.connector {
Some(service_manifest_latest::Value::Swagger(swagger)) => {
if let Some(connector) = &self.connector {
let api = &service.commonApi;
let creds = credentials.as_ref();

Expand All @@ -233,7 +233,7 @@ impl Engine {
))
}
}
&Some(service_manifest_latest::Value::Action(ref action)) => {
Some(service_manifest_latest::Value::Action(action)) => {
let operation = action
.operations
.iter()
Expand Down Expand Up @@ -275,8 +275,8 @@ impl Engine {
)))
}
}
&Some(service_manifest_latest::Value::ApiWrapped(ref api_wrapped)) => {
if let &Some(ref filtered_runner) = &self.filtered_runner {
Some(service_manifest_latest::Value::ApiWrapped(api_wrapped)) => {
if let Some(filtered_runner) = &self.filtered_runner {
self.log(identifier, "API_WRAPPED", "STARTED")?;
let result = filtered_runner.run(
service_name,
Expand All @@ -294,7 +294,7 @@ impl Engine {
))
}
}
&Some(service_manifest_latest::Value::SimpleCode(ref simple_code)) => {
Some(service_manifest_latest::Value::SimpleCode(simple_code)) => {
match simple_code.code.language.enum_value() {
Ok(Language::PYTHON) => self.dispatch_code_runner(
identifier,
Expand Down Expand Up @@ -371,7 +371,7 @@ impl Engine {
let manifest = service.manifest.v2();

match &manifest.value {
&Some(service_manifest_latest::Value::Workflow(ref workflow)) => {
Some(service_manifest_latest::Value::Workflow(workflow)) => {
let workflow_runner = self.workflow_runner.clone().ok_or_else(|| {
error::ExecutionEngine::NotFound("Workflow runner not registered".into())
})?;
Expand Down Expand Up @@ -451,7 +451,7 @@ impl Engine {

matches!(
&manifest.value,
&Some(service_manifest_latest::Value::Workflow(_))
Some(service_manifest_latest::Value::Workflow(_))
)
}

Expand Down Expand Up @@ -498,7 +498,7 @@ impl Engine {
let manifest = service.manifest.v2();

match &manifest.value {
&Some(service_manifest_latest::Value::Swagger(ref swagger)) => {
Some(service_manifest_latest::Value::Swagger(swagger)) => {
let async_connector = self.async_connector.clone().ok_or_else(|| {
error::ExecutionEngine::NotFound("Async data connector not registered".into())
})?;
Expand Down
4 changes: 2 additions & 2 deletions usecases/service_loader/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ pub fn merge(
.ok_or_else(|| error::ServiceLoader::NotFound("Auth Configuration".into()))?;
let oauth_config = oauth_config.mut_oauthConfig();

if let &Some(core_entities::service::swagger_overrides::AuthOverrides::OauthConfig(
ref oauth_config_override,
if let Some(core_entities::service::swagger_overrides::AuthOverrides::OauthConfig(
oauth_config_override,
)) = &overrides.authOverrides
{
apply_if_exists!(name, oauth_config_override => oauth_config);
Expand Down
2 changes: 1 addition & 1 deletion usecases/service_loader/src/loaders/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ pub fn load_configuration<R: io::Read>(
/// intermediate path segment lands on a non-object value.
fn traverse_map(current: &mut serde_json::Value, parts: &[&str], value: &str) -> error::Result<()> {
if let Some(next) = parts.first() {
if let &mut serde_json::Value::Object(ref mut current) = current {
if let serde_json::Value::Object(current) = current {
let key = (*next).to_owned();
let child = current
.entry(key)
Expand Down
8 changes: 4 additions & 4 deletions usecases/service_loader/src/loaders/openapi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ fn collect_operations<R: io::Read>(
schemas: &mut HashMap<String, service::Schema>,
) -> error::Result<Vec<(String, service::Operation)>> {
let reference = handle_reference(item, root, fetcher, cache, &mut HashSet::new())?;
let item = reference.as_ref().map_or(item, |&(_, ref item)| item);
let item = reference.as_ref().map_or(item, |(_, item)| item);

let parameters: Vec<serde_json::Value> = default_field(item, "parameters")?;
let mut common_params = vec![];
Expand Down Expand Up @@ -286,7 +286,7 @@ fn handle_parameter<R: io::Read>(
schemas: &mut HashMap<String, service::Schema>,
) -> error::Result<()> {
let reference = handle_reference(source, root, fetcher, cache, &mut HashSet::new())?;
let source = reference.as_ref().map_or(source, |&(_, ref item)| item);
let source = reference.as_ref().map_or(source, |(_, item)| item);

let in_ = required_field::<String>(source, "in")?;
let in_ = match in_.as_str() {
Expand Down Expand Up @@ -325,7 +325,7 @@ fn handle_request_body<R: io::Read>(
schemas: &mut HashMap<String, service::Schema>,
) -> error::Result<()> {
let reference = handle_reference(source, root, fetcher, cache, &mut HashSet::new())?;
let source = reference.as_ref().map_or(source, |&(_, ref item)| item);
let source = reference.as_ref().map_or(source, |(_, item)| item);

if let Some(description) = optional_field(source, "description")? {
sink.description = description;
Expand Down Expand Up @@ -353,7 +353,7 @@ fn handle_response<R: io::Read>(
schemas: &mut HashMap<String, service::Schema>,
) -> error::Result<()> {
let reference = handle_reference(source, root, fetcher, cache, &mut HashSet::new())?;
let source = reference.as_ref().map_or(source, |&(_, ref item)| item);
let source = reference.as_ref().map_or(source, |(_, item)| item);

let content: HashMap<String, serde_json::Value> = default_field(source, "content")?;
for (key, value) in &content {
Expand Down
20 changes: 10 additions & 10 deletions usecases/service_writer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,13 +223,13 @@ fn handle_operation(
sink.insert("parameters".into(), parameters.into());
}

if let &Some(ref source_body) = &source.requestBody.0 {
if let Some(source_body) = &source.requestBody.0 {
let mut request_body = serde_json::Map::new();
handle_request_body(&mut request_body, source_body)?;
sink.insert("requestBody".into(), request_body.into());
}

if let &Some(ref common_responses) = &source.apiResponses.0 {
if let Some(common_responses) = &source.apiResponses.0 {
let mut responses = serde_json::Map::new();

for (status, common_response) in &common_responses.apiResponses {
Expand Down Expand Up @@ -294,7 +294,7 @@ fn handle_media(
sink: &mut serde_json::Map<String, serde_json::Value>,
source: &service::MediaType,
) -> error::Result<()> {
if let &Some(ref common_schema) = &source.schema.0 {
if let Some(common_schema) = &source.schema.0 {
let mut schema = serde_json::Map::new();
handle_schema(&mut schema, common_schema)?;
sink.insert("schema".into(), schema.into());
Expand Down Expand Up @@ -327,7 +327,7 @@ fn handle_parameter(
sink.insert("description".into(), source.description.clone().into());
}

if let &Some(ref common_schema) = &source.schema.0 {
if let Some(common_schema) = &source.schema.0 {
let mut schema = serde_json::Map::new();
handle_schema(&mut schema, common_schema)?;
sink.insert("schema".into(), schema.into());
Expand All @@ -346,10 +346,10 @@ fn handle_schema(
// TODO: extract into a referece based on a flag

match &source.value {
&Some(service::schema::Value::Ref(ref reference)) => {
Some(service::schema::Value::Ref(reference)) => {
sink.insert("$ref".into(), reference.clone().into());
}
&Some(service::schema::Value::SchemaObject(ref schema)) => {
Some(service::schema::Value::SchemaObject(schema)) => {
match schema.type_.enum_value() {
Ok(service::schema_object::SchemaType::STRING) => {
sink.insert("type".into(), "string".into());
Expand Down Expand Up @@ -387,7 +387,7 @@ fn handle_schema(
Ok(service::schema_object::SchemaType::ARRAY) => {
sink.insert("type".into(), "array".into());

if let &Some(ref common_items) = &schema.items.0 {
if let Some(common_items) = &schema.items.0 {
let mut items = serde_json::Map::new();
handle_schema(&mut items, common_items)?;
sink.insert("items".into(), items.into());
Expand All @@ -398,13 +398,13 @@ fn handle_schema(
_ => {}
}
}
&Some(service::schema::Value::AllOf(ref values)) => {
Some(service::schema::Value::AllOf(values)) => {
handle_composed_schema(sink, "allOf", values)?;
}
&Some(service::schema::Value::AnyOf(ref values)) => {
Some(service::schema::Value::AnyOf(values)) => {
handle_composed_schema(sink, "anyOf", values)?;
}
&Some(service::schema::Value::OneOf(ref values)) => {
Some(service::schema::Value::OneOf(values)) => {
handle_composed_schema(sink, "oneOf", values)?;
}
_ => {}
Expand Down
Loading