Merge pull request #34058 from jimblye/schemagen-unit-test-failures

Fix schemaGen generated xsd is missing attributes for onError

Author: jimblye

dev/com.ibm.ws.config/src/com/ibm/ws/config/schemagen/internal/SchemaWriter.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2014 IBM Corporation and others.
+ * Copyright (c) 2011, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -1141,9 +1141,14 @@ private void writeTypeMember(final TypeMember member, boolean addCardinalityMinM
         }
 
         // If the type is onError then we should generate the onError enum.
-        AttributeDefinition optionAD = attribute.getType() == MetaTypeFactory.ON_ERROR_TYPE ? onErrorDefinition : attribute;
+        AttributeDefinition optionAD = attribute.getType() == MetaTypeFactory.ON_ERROR_TYPE && onErrorDefinition != null ? onErrorDefinition : attribute;
 
         String[] optionValues = optionAD != null ? optionAD.getOptionValues() : null;
+        
+        // If this is an onError type but has no options defined, provide default options
+        if (attribute.getType() == MetaTypeFactory.ON_ERROR_TYPE && (optionValues == null || optionValues.length == 0)) {
+            optionValues = new String[] { "WARN", "FAIL", "IGNORE" };
+        }
 
         final boolean altLabel = alternateLabel;
         DocumentationWriter docWriter = new DocumentationWriter() {

dev/com.ibm.ws.config/src/com/ibm/ws/config/schemagen/internal/TypeMember.java

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
+ * Copyright (c) 2009, 2026 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -85,10 +85,8 @@ public String getType(boolean global) {
         } else if (global) {
             return type.getGlobalSchemaType();
         } else {
-            type.getSchemaBaseType();
+            return type.getSchemaBaseType();
         }
-
-        return "xsd:string";
     }
 
     public void setCardinality(int cardinality) {