Skip to content
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

KOGITO-4343: fixed jsonix CCE with gwt290 #3570

Closed
wants to merge 1 commit into from
Closed

KOGITO-4343: fixed jsonix CCE with gwt290 #3570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 ...c/main/java/org/kie/workbench/common/dmn/client/docks/navigator/drds/DRGDiagramUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public static DMNDiagramElement newDRGInstance() {
}

public static JSIDMNDiagram newJSIDRGInstance() {
final JSIDMNDiagram diagram = new JSIDMNDiagram();
final JSIDMNDiagram diagram = JSIDMNDiagram.newInstance();
diagram.setId(new Id().getValue());
diagram.setName(DRG);
return diagram;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/kie/workbench/common/dmn/client/marshaller/common/DMNDiagramElementsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ private List<JSIDMNDiagram> findEligibleDRGs(final List<JSIDMNDiagram> dmnDiagra

private List<JSIDMNDiagram> getDmnDiagram(final JSITDefinitions dmnDefinitions) {
if (dmnDefinitions.getDMNDI() == null) {
dmnDefinitions.setDMNDI(new JSIDMNDI());
dmnDefinitions.setDMNDI(JSIDMNDI.newInstance());
}
return dmnDefinitions.getDMNDI().getDMNDiagram();
}
Expand Down
14 changes: 7 additions & 7 deletions ...ent/src/main/java/org/kie/workbench/common/dmn/client/marshaller/common/WrapperUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,21 +231,21 @@ private static JSIDMNShape stunnerToDDExt(final JSIDMNDiagram diagram,
final Definitions definitionsStunnerPojo,
final View<? extends DMNElement> v,
final String namespaceURI) {
final JSIDMNShape result = new JSIDMNShape();
final JSIDMNShape result = JSIDMNShape.newInstance();
final DMNElement definition = v.getDefinition();
final String dmnElementId = definition.getId().getValue();
final String shapeId = getShapeId(diagram, dmnDiagramElementIds, dmnElementId);

result.setId(shapeId);
result.setDmnElementRef(getDmnElementRef(definitionsStunnerPojo, v, namespaceURI));
final JSIBounds bounds = new JSIBounds();
final JSIBounds bounds = JSIBounds.newInstance();
result.setBounds(bounds);
bounds.setX(xOfBound(upperLeftBound(v)));
bounds.setY(yOfBound(upperLeftBound(v)));
result.setDMNLabel(new JSIDMNLabel());
result.setDMNLabel(JSIDMNLabel.newInstance());
// TODO {gcardosi}: HARDCODED
result.setIsCollapsed(false);
final JSIDMNStyle style = new JSIDMNStyle();
final JSIDMNStyle style = JSIDMNStyle.newInstance();
if (v.getDefinition() instanceof Decision) {
final Decision d = (Decision) v.getDefinition();
applyBounds(d.getDimensionsSet(), bounds);
Expand Down Expand Up @@ -276,13 +276,13 @@ private static JSIDMNShape stunnerToDDExt(final JSIDMNDiagram diagram,
applyBounds(d.getDimensionsSet(), bounds);
applyBackgroundStyles(d.getBackgroundSet(), style);
applyFontStyle(d.getFontSet(), style);
final JSIDMNDecisionServiceDividerLine dl = new JSIDMNDecisionServiceDividerLine();
final JSIPoint leftPoint = new JSIPoint();
final JSIDMNDecisionServiceDividerLine dl = JSIDMNDecisionServiceDividerLine.newInstance();
final JSIPoint leftPoint = JSIPoint.newInstance();
leftPoint.setX(v.getBounds().getUpperLeft().getX());
final double dlY = v.getBounds().getUpperLeft().getY() + d.getDividerLineY().getValue();
leftPoint.setY(dlY);
dl.addWaypoint(leftPoint);
final JSIPoint rightPoint = new JSIPoint();
final JSIPoint rightPoint = JSIPoint.newInstance();
rightPoint.setX(v.getBounds().getLowerRight().getX());
rightPoint.setY(dlY);
dl.addWaypoint(rightPoint);
Expand Down
10 changes: 5 additions & 5 deletions .../java/org/kie/workbench/common/dmn/client/marshaller/converters/AssociationConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class AssociationConverter {
@SuppressWarnings("unchecked")
public static List<JSITAssociation> dmnFromWB(final Node<View<TextAnnotation>, ?> node) {
final TextAnnotation ta = (TextAnnotation) DefinitionUtils.getElementDefinition(node);
final JSITDMNElementReference ta_elementReference = new JSITDMNElementReference();
final JSITDMNElementReference ta_elementReference = JSITDMNElementReference.newInstance();
ta_elementReference.setHref("#" + ta.getId().getValue());

final List<JSITAssociation> result = new ArrayList<>();
Expand All @@ -51,10 +51,10 @@ public static List<JSITAssociation> dmnFromWB(final Node<View<TextAnnotation>, ?
final View<?> view = (View<?>) sourceNode.getContent();
if (view.getDefinition() instanceof DRGElement) {
final DRGElement drgElement = (DRGElement) view.getDefinition();
final JSITDMNElementReference sourceRef = new JSITDMNElementReference();
final JSITDMNElementReference sourceRef = JSITDMNElementReference.newInstance();
sourceRef.setHref(getHref(drgElement));

final JSITAssociation adding = new JSITAssociation();
final JSITAssociation adding = JSITAssociation.newInstance();
adding.setId(((View<Association>) e.getContent()).getDefinition().getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(((View<Association>) e.getContent()).getDefinition().getDescription()));
description.ifPresent(adding::setDescription);
Expand All @@ -72,10 +72,10 @@ public static List<JSITAssociation> dmnFromWB(final Node<View<TextAnnotation>, ?
final View<?> view = (View<?>) targetNode.getContent();
if (view.getDefinition() instanceof DRGElement) {
final DRGElement drgElement = (DRGElement) view.getDefinition();
final JSITDMNElementReference targetRef = new JSITDMNElementReference();
final JSITDMNElementReference targetRef = JSITDMNElementReference.newInstance();
targetRef.setHref(getHref(drgElement));

final JSITAssociation adding = new JSITAssociation();
final JSITAssociation adding = JSITAssociation.newInstance();
adding.setId(((View<Association>) e.getContent()).getDefinition().getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(((View<Association>) e.getContent()).getDefinition().getDescription()));
description.ifPresent(adding::setDescription);
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/kie/workbench/common/dmn/client/marshaller/converters/BindingPropertyConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ public static JSITBinding dmnFromWB(final Binding wb,
if (Objects.isNull(wb)) {
return null;
}
final JSITBinding result = new JSITBinding();
final JSITBinding result = JSITBinding.newInstance();
final JSITInformationItem convertedParameter = InformationItemPropertyConverter.dmnFromWB(wb.getParameter());
final JSITExpression convertedExpression = ExpressionPropertyConverter.dmnFromWB(wb.getExpression(),
componentWidthsConsumer);
Expand Down
16 changes: 8 additions & 8 deletions ...ie/workbench/common/dmn/client/marshaller/converters/BusinessKnowledgeModelConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public BusinessKnowledgeModelConverter(final FactoryManager factoryManager) {
public JSITBusinessKnowledgeModel dmnFromNode(final Node<View<BusinessKnowledgeModel>, ?> node,
final Consumer<JSITComponentWidths> componentWidthsConsumer) {
final BusinessKnowledgeModel source = (BusinessKnowledgeModel) DefinitionUtils.getElementDefinition(node);
final JSITBusinessKnowledgeModel result = new JSITBusinessKnowledgeModel();
final JSITBusinessKnowledgeModel result = JSITBusinessKnowledgeModel.newInstance();
result.setId(source.getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(source.getDescription()));
description.ifPresent(result::setDescription);
Expand All @@ -135,7 +135,7 @@ public JSITBusinessKnowledgeModel dmnFromNode(final Node<View<BusinessKnowledgeM
if (Objects.nonNull(wbFunctionDefinition)) {
final String uuid = wbFunctionDefinition.getId().getValue();
if (Objects.nonNull(uuid)) {
final JSITComponentWidths componentWidths = new JSITComponentWidths();
final JSITComponentWidths componentWidths = JSITComponentWidths.newInstance();
componentWidths.setDmnElementRef(uuid);
source.getEncapsulatedLogic().getComponentWidths()
.stream()
Expand All @@ -156,24 +156,24 @@ public JSITBusinessKnowledgeModel dmnFromNode(final Node<View<BusinessKnowledgeM
if (view.getDefinition() instanceof DRGElement) {
final DRGElement drgElement = (DRGElement) view.getDefinition();
if (drgElement instanceof BusinessKnowledgeModel) {
final JSITKnowledgeRequirement iReq = new JSITKnowledgeRequirement();
final JSITKnowledgeRequirement iReq = JSITKnowledgeRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredKnowledge(ri);
result.addKnowledgeRequirement(iReq);
} else if (drgElement instanceof KnowledgeSource) {
final JSITAuthorityRequirement iReq = new JSITAuthorityRequirement();
final JSITAuthorityRequirement iReq = JSITAuthorityRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredAuthority(ri);
result.addAuthorityRequirement(iReq);
} else if (drgElement instanceof DecisionService) {
if (e.getContent() instanceof View && ((View) e.getContent()).getDefinition() instanceof KnowledgeRequirement) {
final JSITKnowledgeRequirement iReq = new JSITKnowledgeRequirement();
final JSITKnowledgeRequirement iReq = JSITKnowledgeRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredKnowledge(ri);
result.addKnowledgeRequirement(iReq);
Expand Down
4 changes: 2 additions & 2 deletions .../kie/workbench/common/dmn/client/marshaller/converters/ContextEntryPropertyConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,13 @@ public static ContextEntry wbFromDMN(final JSITContextEntry dmn,

public static JSITContextEntry dmnFromWB(final ContextEntry wb,
final Consumer<JSITComponentWidths> componentWidthsConsumer) {
final JSITContextEntry result = new JSITContextEntry();
final JSITContextEntry result = JSITContextEntry.newInstance();

final JSITInformationItem variable = InformationItemPropertyConverter.dmnFromWB(wb.getVariable());
JSITExpression expression = ExpressionPropertyConverter.dmnFromWB(wb.getExpression(),
componentWidthsConsumer);
if (Objects.isNull(expression)) {
final JSITLiteralExpression mockLiteralExpression = new JSITLiteralExpression();
final JSITLiteralExpression mockLiteralExpression = JSITLiteralExpression.newInstance();
mockLiteralExpression.setText(ContextEntry.DEFAULT_EXPRESSION_VALUE);
expression = getWrappedJSITLiteralExpression(mockLiteralExpression, "dmn", "literalExpression");
}
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/kie/workbench/common/dmn/client/marshaller/converters/ContextPropertyConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static Context wbFromDMN(final JSITContext dmn,

public static JSITContext dmnFromWB(final Context wb,
final Consumer<JSITComponentWidths> componentWidthsConsumer) {
final JSITContext result = new JSITContext();
final JSITContext result = JSITContext.newInstance();
result.setId(wb.getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(wb.getDescription()));
description.ifPresent(result::setDescription);
Expand Down
2 changes: 1 addition & 1 deletion ...g/kie/workbench/common/dmn/client/marshaller/converters/DMNElementReferenceConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static DMNElementReference wbFromDMN(final JSITDMNElementReference dmn) {
}

public static JSITDMNElementReference dmnFromWB(final DMNElementReference wb) {
final JSITDMNElementReference result = new JSITDMNElementReference();
final JSITDMNElementReference result = JSITDMNElementReference.newInstance();
result.setHref(wb.getHref());

return result;
Expand Down
6 changes: 3 additions & 3 deletions ...orkbench/common/dmn/client/marshaller/converters/DMNExternalLinksToExtensionElements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ static void loadExternalLinksIntoExtensionElements(final DRGElement source,
removeAllExistingLinks(elements);

for (final DMNExternalLink link : links.getLinks()) {
final JSITAttachment attachment = new JSITAttachment();
final JSITAttachment attachment = JSITAttachment.newInstance();
attachment.setName(link.getDescription());
attachment.setUrl(link.getUrl());

Expand All @@ -75,7 +75,7 @@ static void loadExternalLinksIntoExtensionElements(final DRGElement source,
}

private static void removeAllExistingLinks(final JSITDMNElement.JSIExtensionElements elements) {
final JSITDMNElement.JSIExtensionElements others = new JSITDMNElement.JSIExtensionElements();
final JSITDMNElement.JSIExtensionElements others = JSITDMNElement.JSIExtensionElements.newInstance();
// Add because it is present in the original JSON when unmarshalling
others.setAny(new ArrayList<>());
final List<Object> any = elements.getAny();
Expand All @@ -91,7 +91,7 @@ private static void removeAllExistingLinks(final JSITDMNElement.JSIExtensionElem
private static JSITDMNElement.JSIExtensionElements getOrCreateExtensionElements(final JSITDRGElement target) {
// Add because it is present in the original JSON when unmarshalling
JSITDMNElement.JSIExtensionElements toReturn = Objects.isNull(target.getExtensionElements())
? new JSITDMNElement.JSIExtensionElements()
? JSITDMNElement.JSIExtensionElements.newInstance()
: target.getExtensionElements();
if (!Objects.isNull(toReturn) && Objects.isNull(toReturn.getAny())) {
toReturn.setAny(new ArrayList<>());
Expand Down
22 changes: 11 additions & 11 deletions ...ain/java/org/kie/workbench/common/dmn/client/marshaller/converters/DecisionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public DecisionConverter(final FactoryManager factoryManager) {
public JSITDecision dmnFromNode(final Node<View<Decision>, ?> node,
final Consumer<JSITComponentWidths> componentWidthsConsumer) {
final Decision source = (Decision) DefinitionUtils.getElementDefinition(node);
final JSITDecision d = new JSITDecision();
final JSITDecision d = JSITDecision.newInstance();
d.setId(source.getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(source.getDescription()));
description.ifPresent(d::setDescription);
Expand Down Expand Up @@ -164,40 +164,40 @@ public JSITDecision dmnFromNode(final Node<View<Decision>, ?> node,
if (view.getDefinition() instanceof DRGElement) {
final DRGElement drgElement = (DRGElement) view.getDefinition();
if (drgElement instanceof Decision) {
final JSITInformationRequirement iReq = new JSITInformationRequirement();
final JSITInformationRequirement iReq = JSITInformationRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredDecision(ri);
d.addInformationRequirement(iReq);
} else if (drgElement instanceof BusinessKnowledgeModel) {
final JSITKnowledgeRequirement iReq = new JSITKnowledgeRequirement();
final JSITKnowledgeRequirement iReq = JSITKnowledgeRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredKnowledge(ri);
d.addKnowledgeRequirement(iReq);
} else if (drgElement instanceof KnowledgeSource) {
final JSITAuthorityRequirement iReq = new JSITAuthorityRequirement();
final JSITAuthorityRequirement iReq = JSITAuthorityRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredAuthority(ri);
d.addAuthorityRequirement(iReq);
} else if (drgElement instanceof InputData) {
final JSITInformationRequirement iReq = new JSITInformationRequirement();
final JSITInformationRequirement iReq = JSITInformationRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredInput(ri);
d.addInformationRequirement(iReq);
} else if (drgElement instanceof DecisionService) {
if (e.getContent() instanceof Child) {
// Stunner relationship of this Decision be encapsulated by the DecisionService, not managed here.
} else if (e.getContent() instanceof View && ((View) e.getContent()).getDefinition() instanceof KnowledgeRequirement) {
final JSITKnowledgeRequirement iReq = new JSITKnowledgeRequirement();
final JSITKnowledgeRequirement iReq = JSITKnowledgeRequirement.newInstance();
iReq.setId(getRawId(e.getUUID()));
final JSITDMNElementReference ri = new JSITDMNElementReference();
final JSITDMNElementReference ri = JSITDMNElementReference.newInstance();
ri.setHref(getHref(drgElement));
iReq.setRequiredKnowledge(ri);
d.addKnowledgeRequirement(iReq);
Expand Down
2 changes: 1 addition & 1 deletion .../kie/workbench/common/dmn/client/marshaller/converters/DecisionRulePropertyConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public static DecisionRule wbFromDMN(final JSITDecisionRule dmn) {
}

public static JSITDecisionRule dmnFromWB(final DecisionRule wb) {
final JSITDecisionRule result = new JSITDecisionRule();
final JSITDecisionRule result = JSITDecisionRule.newInstance();
result.setId(wb.getId().getValue());
final Optional<String> description = Optional.ofNullable(DescriptionPropertyConverter.dmnFromWB(wb.getDescription()));
description.ifPresent(result::setDescription);
Expand Down
Loading