simplify

Author: Spence1115

lib/rspec/openapi/schema_builder.rb

@@ -278,9 +278,6 @@ def build_array_items_schema(array, record: nil)
           else
             merged_schema[:properties][key] = property_variations.first.dup
           end
-        else
-          unique_schemas = property_variations.map { |p| p.reject { |k, _| k == :nullable } }.uniq
-          merged_schema[:properties][key] = { oneOf: unique_schemas }
         end
 
         merged_schema[:properties][key][:nullable] = true if property_variations.size < all_schemas.size
@@ -364,34 +361,13 @@ def merge_object_schemas(schema1, schema2)
   def merge_property_schemas(prop1, prop2)
     return prop1 unless prop2.is_a?(Hash) && prop1.is_a?(Hash)
 
-    if prop1[:oneOf] || prop2[:oneOf] || (prop1[:type] && prop2[:type] && prop1[:type] != prop2[:type])
-      schemas = []
-
-      [prop1, prop2].each do |prop|
-        if prop[:oneOf]
-          prop[:oneOf].each do |schema|
-            schemas.concat(schema[:oneOf] || [schema])
-          end
-        elsif prop[:type]
-          schemas << prop.reject { |k, _| k == :nullable }
-        end
-      end
-
-      schemas = schemas.uniq
-
-      merged = schemas.size == 1 ? schemas.first.dup : { oneOf: schemas }
-      merged[:nullable] = true if prop1[:nullable] || prop2[:nullable]
-      return merged
-    end
-
     merged = prop1.dup
+
+     # If either property is nullable, the merged property should be nullable
     merged[:nullable] = true if prop2[:nullable] && !prop1[:nullable]
 
-    if prop1[:type] == 'array' && prop2[:type] == 'array'
-      merged[:items] = merge_property_schemas(prop1[:items], prop2[:items]) if prop1[:items] && prop2[:items]
-    elsif prop1[:type] == 'object' && prop2[:type] == 'object'
-      merged = merge_object_schemas(prop1, prop2)
-    end
+    # If both are objects, recursively merge their properties
+    merged = merge_object_schemas(prop1, prop2) if prop1[:type] == 'object' && prop2[:type] == 'object'
 
     merged
   end

lib/rspec/openapi/schema_merger.rb

@@ -77,17 +77,11 @@ def merge_closest_match!(options, spec)
 
     return if option&.key?(:$ref)
 
+    return if spec[:oneOf]
+
     if score.to_f > SIMILARITY_THRESHOLD
       merge_schema!(option, spec)
-    elsif spec[:oneOf]
-      spec[:oneOf].each do |schema|
-        if schema[:oneOf]
-          merge_closest_match!(options, schema)
-        elsif options.none? { |opt| opt == schema }
-          options.push(schema)
-        end
-      end
-    elsif options.none? { |opt| opt == spec }
+    else
       options.push(spec)
     end
   end