Skip to content

Fix the DMN 1.2 parsing of an DMNDI:DMNLabel DMNDI:TEXT child element #2432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 16, 2019
Merged

Fix the DMN 1.2 parsing of an DMNDI:DMNLabel DMNDI:TEXT child element #2432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3188faf
Fix the DMN 1.2 parsing of an DMNDI:DMNLabel DMNDI:TEXT child element
SimonRinguette Jul 5, 2019
cf766fd
Refactoring (#3)
tarilabs Jul 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...backend/src/main/java/org/kie/dmn/backend/marshalling/v1_2/xstream/DMNLabelConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

public class DMNLabelConverter extends ShapeConverter {

private static final String TEXT = "Text";
public static final String TEXT = "Text";

public DMNLabelConverter(XStream xstream) {
super(xstream);
Expand Down
1 change: 1 addition & 0 deletions .../java/org/kie/dmn/backend/marshalling/v1_2/xstream/DMNModelInstrumentedBaseConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ protected void writeAttributes(HierarchicalStreamWriter writer, Object parent) {
staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, "DMNEdge", dmndiPrefix), "DMNEdge");
staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, "DMNDecisionServiceDividerLine", dmndiPrefix), "DMNDecisionServiceDividerLine");
staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, "DMNLabel", dmndiPrefix), "DMNLabel");
staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, DMNLabelConverter.TEXT, dmndiPrefix), DMNLabelConverter.TEXT);
staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, "Size", dmndiPrefix), "Size");

staxWriter.getQNameMap().registerMapping(new QName(KieDMNModelInstrumentedBase.URI_DMNDI, "FillColor", dmndiPrefix), "FillColor");
Expand Down
1 change: 1 addition & 0 deletions ...backend/src/main/java/org/kie/dmn/backend/marshalling/v1_2/xstream/XStreamMarshaller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ private XStream newXStream() {
xStream.alias("waypoint", Point.class);
xStream.registerConverter(new PointConverter(xStream));
xStream.alias("extension", DiagramElement.Extension.class);
xStream.alias(DMNLabelConverter.TEXT, String.class);

xStream.registerConverter(new AssociationConverter( xStream ) );
xStream.registerConverter(new AuthorityRequirementConverter( xStream ) );
Expand Down
5 changes: 5 additions & 0 deletions ...-dmn-backend/src/test/java/org/kie/dmn/backend/marshalling/v1_2/UnmarshalMarshalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,11 @@ public void test_FontSize_sharedStyle() throws Exception {
assertEquals(21d, shape0sharedStyle.getFontSize(), 0.0d);
}

@Test
public void test_DMNLabel_Text() throws Exception {
testRoundTripV12("org/kie/dmn/backend/marshalling/v1_2/", "DMNLabel-Text.dmn");
}

public void testRoundTripV12(String subdir, String xmlfile) throws Exception {
testRoundTrip(subdir, xmlfile, MARSHALLER, DMN12_SCHEMA_SOURCE);
}
Expand Down
19 changes: 19 additions & 0 deletions ...kie-dmn-backend/src/test/resources/org/kie/dmn/backend/marshalling/v1_2/DMNLabel-Text.dmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8" standalone="yes"?>
<semantic:definitions xmlns:semantic="http://www.omg.org/spec/DMN/20180521/MODEL/" xmlns:triso="http://www.trisotech.com/2015/triso/modeling" xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:trisodmn="http://www.trisotech.com/2016/triso/dmn" xmlns:feel="http://www.omg.org/spec/DMN/20180521/FEEL/" xmlns:tc="http://www.omg.org/spec/DMN/20160719/testcase" xmlns:drools="http://www.drools.org/kie/dmn/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rss="http://purl.org/rss/2.0/" xmlns:openapi="https://openapis.org/omg/extension/1.0" xmlns="http://www.trisotech.com/definitions/_9e005ed6-4e16-446f-92d2-360988638c1b" id="_9e005ed6-4e16-446f-92d2-360988638c1b" name="Drawing 1" namespace="http://www.trisotech.com/definitions/_9e005ed6-4e16-446f-92d2-360988638c1b" exporter="DMN Modeler" exporterVersion="6.2.5.201907032309" triso:logoChoice="Default">
<semantic:decision id="_c81f2688-84ba-422c-9a40-8bfd62052a9c" name="Text">
<semantic:variable name="Text" id="_9a4286cb-536e-43a2-945f-569cf794972d" typeRef="Any"/>
</semantic:decision>
<dmndi:DMNDI>
<dmndi:DMNDiagram id="_9188246b-bdb6-42b1-9017-b344c958bca7" triso:modelElementRef="_850f6e9d-25ac-4b06-a427-00c831cb547e" name="Page 1">
<di:extension/>
<dmndi:Size height="1050" width="1485"/>
<dmndi:DMNShape id="_2da82f9a-f625-4338-b597-4be80692d9f3" dmnElementRef="_c81f2688-84ba-422c-9a40-8bfd62052a9c">
<dc:Bounds x="481.5" y="233" width="153" height="60"/>
<dmndi:DMNLabel sharedStyle="LS_9e005ed6-4e16-446f-92d2-360988638c1b_0" trisodmn:defaultBounds="true">
<dmndi:Text>Alternate Text</dmndi:Text>
</dmndi:DMNLabel>
</dmndi:DMNShape>
</dmndi:DMNDiagram>
<dmndi:DMNStyle id="LS_9e005ed6-4e16-446f-92d2-360988638c1b_0" fontFamily="arial,helvetica,sans-serif" fontSize="11" fontBold="false" fontItalic="false" fontUnderline="false" fontStrikeThrough="false"/>
</dmndi:DMNDI>
</semantic:definitions>