diff --git a/groups/bal/balxml/balxml_configschema.cpp b/groups/bal/balxml/balxml_configschema.cpp index ad9364afcb..a94a26b8fd 100644 --- a/groups/bal/balxml/balxml_configschema.cpp +++ b/groups/bal/balxml/balxml_configschema.cpp @@ -1,7 +1,7 @@ -// balxml_configschema.cpp -*-C++-*- GENERATED FILE -- DO NOT EDIT +// balxml_configschema.cpp *DO NOT EDIT* @generated -*-C++-*- #include -BSLS_IDENT_RCSID(balxml_configschema_cpp,"$Id$ $CSID$") +BSLS_IDENT_RCSID(balxml_configschema_cpp, "$Id$ $CSID$") #include @@ -289,6 +289,17 @@ const char ConfigSchema::TEXT[] = " \n" " \n" " \n" +" \n" +" \n" +" \n" +" Option to validate the root tag when decoding a structure.\n" +" \n" +" \n" +" \n" " \n" " \n" "\n" @@ -296,23 +307,14 @@ const char ConfigSchema::TEXT[] = ; } // close namespace balxml -} // close enterprise namespace - -// BAS_CODEGEN RUN BY code_from_xsd.pl RUN ON Thu Oct 29 10:41:51 EDT 2020 -// GENERATED BY BLP_BAS_CODEGEN_2020.10.18 +} // close namespace BloombergLP +// GENERATED BY BLP_BAS_CODEGEN_2024.05.02 +// USING bas_codegen.pl -m cfg -p balxml -E --noExternalization --noAggregateConversion --noHashSupport balxml.xsd // ---------------------------------------------------------------------------- -// Copyright 2020 Bloomberg Finance L.P. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ----------------------------- END-OF-FILE ---------------------------------- +// NOTICE: +// Copyright 2024 Bloomberg Finance L.P. All rights reserved. +// Property of Bloomberg Finance L.P. (BFLP) +// This software is made available solely pursuant to the +// terms of a BFLP license agreement which governs its use. +// ------------------------------- END-OF-FILE -------------------------------- diff --git a/groups/bal/balxml/balxml_configschema.h b/groups/bal/balxml/balxml_configschema.h index d5e114978f..e87f94b88d 100644 --- a/groups/bal/balxml/balxml_configschema.h +++ b/groups/bal/balxml/balxml_configschema.h @@ -1,9 +1,9 @@ -// balxml_configschema.h -*-C++-*- GENERATED FILE -- DO NOT EDIT +// balxml_configschema.h *DO NOT EDIT* @generated -*-C++-*- #ifndef INCLUDED_BALXML_CONFIGSCHEMA #define INCLUDED_BALXML_CONFIGSCHEMA #include -BSLS_IDENT_RCSID(balxml_configschema_h,"$Id$ $CSID$") +BSLS_IDENT_RCSID(balxml_configschema_h, "$Id$ $CSID$") BSLS_IDENT_PRAGMA_ONCE //@PURPOSE: Provide the service configuration schema @@ -11,7 +11,7 @@ BSLS_IDENT_PRAGMA_ONCE //@CLASSES: // balxml::ConfigSchema: the configuration schema // -//@DESCRIPTION: This component provides a namespace for the +//@DESCRIPTION: This component provides a namespace for the // service configuration schema. This in-core representation of the schema // is used to validate XML configuration data used to initialize the service. @@ -42,25 +42,15 @@ bsl::ostream& balxml::operator<<( return stream << schema.TEXT; } -} // close enterprise namespace +} // close namespace BloombergLP #endif -// BAS_CODEGEN RUN BY code_from_xsd.pl RUN ON Thu Oct 29 10:41:51 EDT 2020 -// GENERATED BY BLP_BAS_CODEGEN_2020.10.18 +// GENERATED BY BLP_BAS_CODEGEN_2024.05.02 // USING bas_codegen.pl -m cfg -p balxml -E --noExternalization --noAggregateConversion --noHashSupport balxml.xsd - // ---------------------------------------------------------------------------- -// Copyright 2020 Bloomberg Finance L.P. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// ----------------------------- END-OF-FILE ---------------------------------- +// NOTICE: +// Copyright 2024 Bloomberg Finance L.P. All rights reserved. +// Property of Bloomberg Finance L.P. (BFLP) +// This software is made available solely pursuant to the +// terms of a BFLP license agreement which governs its use. +// ------------------------------- END-OF-FILE -------------------------------- diff --git a/groups/bal/balxml/balxml_configschema.t.cpp b/groups/bal/balxml/balxml_configschema.t.cpp index 25d54ed49f..c8404bb730 100644 --- a/groups/bal/balxml/balxml_configschema.t.cpp +++ b/groups/bal/balxml/balxml_configschema.t.cpp @@ -430,6 +430,18 @@ void TestUtil::loadDecoderOptions(ComplexTypeElement *decoderOptions) SchemaUtil::append(&sequence, validateInputIsUtf8); } + { + Element validateRootTag; + validateRootTag.name() = "ValidateRootTag"; + validateRootTag.type() = "xs:boolean"; + validateRootTag.minOccurs() = "0"; + validateRootTag.maxOccurs() = "1"; + validateRootTag.defaultValue() = "false"; + validateRootTag.allowsDirectManipulation() = "0"; + validateRootTag.allocatesMemory() = "0"; + SchemaUtil::append(&sequence, validateRootTag); + } + SchemaUtil::append(decoderOptions, sequence); } @@ -526,7 +538,7 @@ int main(int argc, char *argv[]) // (modulo annotations) to the content that we expect. typedef s_baltst::BasicSchemaUtil SchemaUtil; - ASSERT( + ASSERTV(configSchema, expectedSchema, SchemaUtil::areEqualUpToAnnotation(configSchema, expectedSchema)); if (veryVerbose && !SchemaUtil::areEqualUpToAnnotation( configSchema, expectedSchema)) {