6864: Schema definition doesn't have optional ReturnValue "name" prop…

…erty Reviewed-by: hirt
openjdk · Jul 15, 2020 · db472f6 · db472f6
1 parent 37fef29
commit db472f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/agent/src/main/resources/org/openjdk/jmc/agent/impl/jfrprobes_schema.xsd b/agent/src/main/resources/org/openjdk/jmc/agent/impl/jfrprobes_schema.xsd
@@ -166,6 +166,7 @@
 			<xs:documentation>This will only work if we allow toString</xs:documentation>
 		</xs:annotation>
 		<xs:all>
+			<xs:element type="xs:string" name="name" minOccurs="0" />
 			<xs:element type="xs:string" name="description" minOccurs="0" />
 			<xs:element type="contentTypeType" name="contenttype" minOccurs="0" />
 			<xs:element type="relationKeyType" name="relationkey" minOccurs="0" />

diff --git a/agent/src/test/java/org/openjdk/jmc/agent/test/TestProbeDefinitionValidation.java b/agent/src/test/java/org/openjdk/jmc/agent/test/TestProbeDefinitionValidation.java
@@ -42,6 +42,7 @@ public void testValidatingFullyDefinedProbe() throws XMLStreamException {
 				+ "                        <converter>com.company.project.MyConverter</converter>\n"
 				+ "                    </parameter>\n" + "                </parameters>\n"
 				+ "                <returnvalue>\n"
+				+ "                    <name>returnValue</name>\n"
 				+ "                    <description>the return value</description>\n"
 				+ "                    <contenttype>None</contenttype>\n"
 				+ "                    <relationkey>http://project.company.com/relation_id/parameter#0</relationkey>\n"