fix inverted logic cubic-dev-ai has found

Author: thorstenhirsch

modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java

@@ -2794,7 +2794,6 @@ protected void updateModelForComposedSchema(CodegenModel m, Schema schema, Map<S
                 addImport(composed, refSchema, m, modelName);
 
                 if (allDefinitions != null && refSchema != null) {
-                    // Inline properties from oneOf wrapper schemas (cannot be used as parent classes)
                     if (ModelUtils.isOneOfWrapperSchema(refSchema)) {
                         Map<String, Schema> newProperties = new LinkedHashMap<>();
                         addProperties(newProperties, required, refSchema, new HashSet<>());
@@ -3162,10 +3161,23 @@ public CodegenModel fromModel(String name, Schema schema) {
         // remove duplicated properties
         m.removeAllDuplicatedProperty();
 
-        // Mark inherited readonly properties for template to use setter instead of direct field access
         if (m.parent != null && m.readOnlyVars != null) {
+            Schema parentSchema = null;
+            if (allDefinitions != null && m.parentSchema != null) {
+                parentSchema = allDefinitions.get(m.parentSchema);
+            }
+            
+            Set<String> parentReadOnlyNames = new HashSet<>();
+            if (parentSchema != null && parentSchema.getProperties() != null) {
+                for (Map.Entry<String, Schema> entry : ((Map<String, Schema>) parentSchema.getProperties()).entrySet()) {
+                    if (Boolean.TRUE.equals(entry.getValue().getReadOnly())) {
+                        parentReadOnlyNames.add(entry.getKey());
+                    }
+                }
+            }
+            
             for (CodegenProperty roVar : m.readOnlyVars) {
-                if (!Boolean.TRUE.equals(roVar.isOverridden)) {
+                if (Boolean.TRUE.equals(roVar.isOverridden) || parentReadOnlyNames.contains(roVar.baseName)) {
                     roVar.vendorExtensions.put("x-is-inherited-readonly", Boolean.TRUE);
                 }
             }

modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java

@@ -5075,11 +5075,6 @@ private List<String> getNames(List<CodegenProperty> props) {
         return props.stream().map(v -> v.name).collect(Collectors.toList());
     }
 
-    /**
-     * Test that oneOf wrapper schemas are not used as parent classes.
-     * Schemas with oneOf + properties generate AbstractOpenApiSchema subclasses
-     * which cannot be extended. Properties should be inlined instead.
-     */
     @Test
     public void testOneOfWrapperSchemaShouldNotBeUsedAsParent() {
         final DefaultCodegen codegen = new DefaultCodegen();
@@ -5119,10 +5114,6 @@ public void testIsOneOfWrapperSchema() {
                 "ScrollEvent should not be detected as oneOf wrapper");
     }
 
-    /**
-     * Test that inherited readOnly properties use protected setters in @JsonCreator.
-     * Child classes must use setters for inherited readOnly properties since they're private in parent.
-     */
     @Test
     public void testInheritedReadOnlyPropertiesHaveProtectedSetters() {
         final DefaultCodegen codegen = new DefaultCodegen();
@@ -5142,12 +5133,10 @@ public void testInheritedReadOnlyPropertiesHaveProtectedSetters() {
 
         boolean foundInheritedReadOnly = false;
         for (CodegenProperty roVar : extendedModel.readOnlyVars) {
-            if (!Boolean.TRUE.equals(roVar.isOverridden)) {
+            if (Boolean.TRUE.equals(roVar.vendorExtensions.get("x-is-inherited-readonly"))) {
                 foundInheritedReadOnly = true;
-                assertTrue(Boolean.TRUE.equals(roVar.vendorExtensions.get("x-is-inherited-readonly")),
-                        "Inherited readOnly '" + roVar.name + "' should have x-is-inherited-readonly");
             }
         }
-        assertTrue(foundInheritedReadOnly, "ExtendedModel should have inherited readOnly properties");
+        assertTrue(foundInheritedReadOnly, "ExtendedModel should have inherited readOnly properties with x-is-inherited-readonly vendor extension");
     }
 }