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

Fatal error occurs when reporting rule is not given a name #898

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fatal error occurs when reporting rule is not given a name #898

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3cb0df
Added null checks and expection handling when creating the rune ecore…
minesh-s-patel Jan 9, 2025
60cf98a
Merge branch 'main' into issue-897
minesh-s-patel Jan 9, 2025
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
98 changes: 56 additions & 42 deletions ...-lang/src/main/java/com/regnosys/rosetta/resource/RosettaResourceDescriptionStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.regnosys.rosetta.resource;

import org.apache.log4j.Logger;
import org.eclipse.xtext.naming.QualifiedName;
import org.eclipse.xtext.nodemodel.INode;
import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
Expand All @@ -16,46 +17,59 @@
@Singleton
public class RosettaResourceDescriptionStrategy extends DefaultResourceDescriptionStrategy {

@Override
public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
if (eObject instanceof RosettaModel) {
RosettaModel model = (RosettaModel)eObject;

QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(eObject);
acceptor.accept(new RosettaModelDescription(qualifiedName, model));

return true;
} else if (eObject instanceof Attribute) {
Attribute attr = (Attribute)eObject;

QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(attr);
String typeCall = serialize(attr.getTypeCall());
String cardinality = serialize(attr.getCard());
acceptor.accept(new AttributeDescription(qualifiedName, attr, typeCall, cardinality));

return false;
} else if (eObject instanceof RosettaRule) {
RosettaRule rule = (RosettaRule)eObject;

QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(rule);
String input = serialize(rule.getInput());
String expression = serialize(rule.getExpression());
acceptor.accept(new RuleDescription(qualifiedName, rule, input, expression));

return false;
} else {
return super.createEObjectDescriptions(eObject, acceptor);
}
}

private String serialize(EObject eObject) {
if (eObject == null) {
return null;
}
INode node = NodeModelUtils.getNode(eObject);
if (node != null) {
return node.getText();
}
return null;
}
private final static Logger LOG = Logger.getLogger(RosettaResourceDescriptionStrategy.class);

@Override
public boolean createEObjectDescriptions(EObject eObject, IAcceptor<IEObjectDescription> acceptor) {
if (getQualifiedNameProvider() == null) {
return false;
}
try {
if (eObject instanceof RosettaModel) {
return createRosettaModelDescription((RosettaModel) eObject, acceptor);
} else if (eObject instanceof Attribute) {
return createAttributeDescription((Attribute) eObject, acceptor);
} else if (eObject instanceof RosettaRule) {
return createRosettaRuleDescription((RosettaRule) eObject, acceptor);
}
} catch (Exception exc) {
LOG.error(exc.getMessage(), exc);
}
return super.createEObjectDescriptions(eObject, acceptor);
}

private boolean createRosettaModelDescription(RosettaModel model, IAcceptor<IEObjectDescription> acceptor) {
QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(model);
acceptor.accept(new RosettaModelDescription(qualifiedName, model));
return true;
}

private boolean createAttributeDescription(Attribute attr, IAcceptor<IEObjectDescription> acceptor) {
QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(attr);
String typeCall = serialize(attr.getTypeCall());
String cardinality = serialize(attr.getCard());
acceptor.accept(new AttributeDescription(qualifiedName, attr, typeCall, cardinality));
return false;
}

private boolean createRosettaRuleDescription(RosettaRule rule, IAcceptor<IEObjectDescription> acceptor) {
QualifiedName qualifiedName = getQualifiedNameProvider().getFullyQualifiedName(rule);
String input = serialize(rule.getInput());
String expression = serialize(rule.getExpression());
if (qualifiedName != null) {
acceptor.accept(new RuleDescription(qualifiedName, rule, input, expression));
}
return false;
}

private String serialize(EObject eObject) {
if (eObject == null) {
return null;
}
INode node = NodeModelUtils.getNode(eObject);
if (node != null) {
return node.getText();
}
return null;
}
}
Loading