Renamed SingleCompositionError to just CompositionError

Author: TylerBloom

apollo-federation/src/composition/mod.rs

@@ -3,7 +3,7 @@ mod satisfiability;
 use std::vec;
 
 pub use crate::composition::satisfiability::validate_satisfiability;
-use crate::error::SingleCompositionError;
+use crate::error::CompositionError;
 pub use crate::schema::schema_upgrader::upgrade_subgraphs_if_necessary;
 use crate::subgraph::typestate::Expanded;
 use crate::subgraph::typestate::Initial;
@@ -16,7 +16,7 @@ pub use crate::supergraph::Supergraph;
 
 pub fn compose(
     subgraphs: Vec<Subgraph<Initial>>,
-) -> Result<Supergraph<Satisfiable>, Vec<SingleCompositionError>> {
+) -> Result<Supergraph<Satisfiable>, Vec<CompositionError>> {
     let expanded_subgraphs = expand_subgraphs(subgraphs)?;
     let upgraded_subgraphs = upgrade_subgraphs_if_necessary(expanded_subgraphs)?;
     let validated_subgraphs = validate_subgraphs(upgraded_subgraphs)?;
@@ -31,8 +31,8 @@ pub fn compose(
 /// `@link`). This function will update subgraph schemas with all missing federation definitions.
 pub fn expand_subgraphs(
     subgraphs: Vec<Subgraph<Initial>>,
-) -> Result<Vec<Subgraph<Expanded>>, Vec<SingleCompositionError>> {
-    let mut errors: Vec<SingleCompositionError> = vec![];
+) -> Result<Vec<Subgraph<Expanded>>, Vec<CompositionError>> {
+    let mut errors: Vec<CompositionError> = vec![];
     let expanded: Vec<Subgraph<Expanded>> = subgraphs
         .into_iter()
         .map(|s| s.expand_links())
@@ -49,8 +49,8 @@ pub fn expand_subgraphs(
 /// `@key` specifies valid `FieldSet`s etc).
 pub fn validate_subgraphs(
     subgraphs: Vec<Subgraph<Upgraded>>,
-) -> Result<Vec<Subgraph<Validated>>, Vec<SingleCompositionError>> {
-    let mut errors: Vec<SingleCompositionError> = vec![];
+) -> Result<Vec<Subgraph<Validated>>, Vec<CompositionError>> {
+    let mut errors: Vec<CompositionError> = vec![];
     let validated: Vec<Subgraph<Validated>> = subgraphs
         .into_iter()
         .map(|s| s.validate())
@@ -66,18 +66,18 @@ pub fn validate_subgraphs(
 /// Perform validations that require information about all available subgraphs.
 pub fn pre_merge_validations(
     _subgraphs: &[Subgraph<Validated>],
-) -> Result<(), Vec<SingleCompositionError>> {
+) -> Result<(), Vec<CompositionError>> {
     panic!("pre_merge_validations is not implemented yet")
 }
 
 pub fn merge_subgraphs(
     _subgraphs: Vec<Subgraph<Validated>>,
-) -> Result<Supergraph<Merged>, Vec<SingleCompositionError>> {
+) -> Result<Supergraph<Merged>, Vec<CompositionError>> {
     panic!("merge_subgraphs is not implemented yet")
 }
 
 pub fn post_merge_validations(
     _supergraph: &Supergraph<Merged>,
-) -> Result<(), Vec<SingleCompositionError>> {
+) -> Result<(), Vec<CompositionError>> {
     panic!("post_merge_validations is not implemented yet")
 }

apollo-federation/src/composition/satisfiability.rs

@@ -1,12 +1,12 @@
 mod satisfiability_error;
 
-use crate::error::SingleCompositionError;
+use crate::error::CompositionError;
 use crate::supergraph::Merged;
 use crate::supergraph::Satisfiable;
 use crate::supergraph::Supergraph;
 
 pub fn validate_satisfiability(
     _supergraph: Supergraph<Merged>,
-) -> Result<Supergraph<Satisfiable>, Vec<SingleCompositionError>> {
+) -> Result<Supergraph<Satisfiable>, Vec<CompositionError>> {
     panic!("validate_satisfiability is not implemented yet")
 }

apollo-federation/src/error/mod.rs

@@ -116,7 +116,7 @@ pub enum UnsupportedFeatureKind {
 }
 
 #[derive(Debug, Clone, thiserror::Error)]
-pub enum SingleCompositionError {
+pub enum CompositionError {
     #[error("[{subgraph}] {error}")]
     SubgraphError {
         subgraph: String,
@@ -140,7 +140,7 @@ pub enum SingleCompositionError {
     InterfaceObjectUsageError { message: String },
 }
 
-impl From<SubgraphError> for SingleCompositionError {
+impl From<SubgraphError> for CompositionError {
     fn from(SubgraphError { subgraph, error }: SubgraphError) -> Self {
         Self::SubgraphError { subgraph, error }
     }

apollo-federation/src/schema/schema_upgrader.rs

@@ -21,7 +21,7 @@ use super::position::InterfaceTypeDefinitionPosition;
 use super::position::ObjectTypeDefinitionPosition;
 use crate::error::FederationError;
 use crate::error::MultipleFederationErrors;
-use crate::error::SingleCompositionError;
+use crate::error::CompositionError;
 use crate::error::SingleFederationError;
 use crate::internal_error;
 use crate::link::federation_spec_definition::FederationSpecDefinition;
@@ -955,7 +955,7 @@ impl SchemaUpgrader {
 // However, those messages were never used, so we have omitted them here.
 pub fn upgrade_subgraphs_if_necessary(
     subgraphs: Vec<Subgraph<Expanded>>,
-) -> Result<Vec<Subgraph<Upgraded>>, Vec<SingleCompositionError>> {
+) -> Result<Vec<Subgraph<Upgraded>>, Vec<CompositionError>> {
     // if all subgraphs are fed 2, there is no upgrade to be done
     if subgraphs
         .iter()
@@ -966,7 +966,7 @@ pub fn upgrade_subgraphs_if_necessary(
 
     let mut subgraphs_using_interface_object = vec![];
     let mut fed_1_subgraphs = vec![];
-    let mut errors: Vec<SingleCompositionError> = vec![];
+    let mut errors: Vec<CompositionError> = vec![];
     let schema_upgrader: SchemaUpgrader = SchemaUpgrader::new(&subgraphs);
     let upgraded_subgraphs: Vec<Subgraph<Upgraded>> = subgraphs
         .into_iter()
@@ -1007,7 +1007,7 @@ pub fn upgrade_subgraphs_if_necessary(
 
         let interface_object_subgraphs = format_subgraph_names(subgraphs_using_interface_object);
         let fed_v1_subgraphs = format_subgraph_names(fed_1_subgraphs);
-        return Err(vec![SingleCompositionError::InterfaceObjectUsageError {
+        return Err(vec![CompositionError::InterfaceObjectUsageError {
             message: format!(
                 "The @interfaceObject directive can only be used if all subgraphs have \
             federation 2 subgraph schema (schema with a `@link` to \"https://specs.apollo.dev/federation\" \