Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
RagConnect
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
RagConnect
Commits
83180b42
Commit
83180b42
authored
2 years ago
by
René Schöne
Browse files
Options
Downloads
Patches
Plain Diff
rename forwardingNTA to forwarding
parent
0fe7e928
No related branches found
No related tags found
1 merge request
!33
Resolve "Refactorings/Clean-Up"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
ragconnect.base/src/main/jastadd/Intermediate.jadd
+22
-22
22 additions, 22 deletions
ragconnect.base/src/main/jastadd/Intermediate.jadd
ragconnect.base/src/main/resources/sendDefinition.mustache
+4
-4
4 additions, 4 deletions
ragconnect.base/src/main/resources/sendDefinition.mustache
with
26 additions
and
26 deletions
ragconnect.base/src/main/jastadd/Intermediate.jadd
+
22
−
22
View file @
83180b42
...
@@ -445,7 +445,7 @@ aspect MustacheReceiveAndSendAndHandleUri {
...
@@ -445,7 +445,7 @@ aspect MustacheReceiveAndSendAndHandleUri {
eq AttributeEndpointTarget.parentTypeName() = getParentTypeDecl().getName();
eq AttributeEndpointTarget.parentTypeName() = getParentTypeDecl().getName();
eq AttributeEndpointTarget.entityName() = getName();
eq AttributeEndpointTarget.entityName() = getName();
eq RelationEndpointTarget.getterMethodName() = forwarding
NTA_
Name();
eq RelationEndpointTarget.getterMethodName() = forwardingName();
eq RelationEndpointTarget.parentTypeName() = getRole().getType().getName();
eq RelationEndpointTarget.parentTypeName() = getRole().getType().getName();
eq RelationEndpointTarget.entityName() = getRole().getName();
eq RelationEndpointTarget.entityName() = getRole().getName();
eq RelationEndpointTarget.realGetterMethodName() = "get" + getRole().getterMethodName();
eq RelationEndpointTarget.realGetterMethodName() = "get" + getRole().getterMethodName();
...
@@ -466,10 +466,10 @@ aspect MustacheReceiveAndSendAndHandleUri {
...
@@ -466,10 +466,10 @@ aspect MustacheReceiveAndSendAndHandleUri {
eq TypeEndpointTarget.entityName() = getType().getName() + (typeIsList() && !containingEndpointDefinition().getIndexBasedListAccess() ? "List" : "");
eq TypeEndpointTarget.entityName() = getType().getName() + (typeIsList() && !containingEndpointDefinition().getIndexBasedListAccess() ? "List" : "");
private String TypeEndpointTarget.getterMethodeNameHelper(boolean useForwarding) {
private String TypeEndpointTarget.getterMethodeNameHelper(boolean useForwarding) {
return (useForwarding && needForwarding
NTA
() ? forwarding
NTA_
Name() :
return (useForwarding && needForwarding() ? forwardingName() :
"get" + getType().getName() + (typeIsList() && (!containingEndpointDefinition().getIndexBasedListAccess() ||
"get" + getType().getName() + (typeIsList() && (!containingEndpointDefinition().getIndexBasedListAccess() ||
containingEndpointDefinition().getWithAdd()) ? "List" : "") + (typeIsOpt() ? "Opt" : "")
containingEndpointDefinition().getWithAdd()) ? "List" : "") + (typeIsOpt() ? "Opt" : "")
+ (needForwarding
NTA
() ? "NoTransform" : ""));
+ (needForwarding() ? "NoTransform" : ""));
}
}
eq ContextFreeTypeEndpointTarget.getterMethodName() = null;
eq ContextFreeTypeEndpointTarget.getterMethodName() = null;
...
@@ -506,14 +506,14 @@ aspect MustacheSendDefinition {
...
@@ -506,14 +506,14 @@ aspect MustacheSendDefinition {
syn String EndpointDefinition.lastValueSetter() = senderName() + ".setLastValue";
syn String EndpointDefinition.lastValueSetter() = senderName() + ".setLastValue";
syn boolean EndpointDefinition.needForwarding
NTA
() = getEndpointTarget().needForwarding
NTA
();
syn boolean EndpointDefinition.needForwarding() = getEndpointTarget().needForwarding();
syn String EndpointDefinition.forwarding
NTA_
Name() = getEndpointTarget().forwarding
NTA_
Name();
syn String EndpointDefinition.forwardingName() = getEndpointTarget().forwardingName();
syn String EndpointDefinition.forwarding
NTA_
Type() = getEndpointTarget().forwarding
NTA_
Type();
syn String EndpointDefinition.forwardingType() = getEndpointTarget().forwardingType();
syn boolean EndpointDefinition.targetIsAttribute() = getEndpointTarget().isAttributeEndpointTarget();
syn boolean EndpointDefinition.targetIsAttribute() = getEndpointTarget().isAttributeEndpointTarget();
syn boolean EndpointDefinition.indexBasedAccessAndTargetIsNTA() {
syn boolean EndpointDefinition.indexBasedAccessAndTargetIsNTA() {
return typeIsList() && getIndexBasedListAccess() && !needForwarding
NTA
();
return typeIsList() && getIndexBasedListAccess() && !needForwarding();
}
}
syn boolean EndpointDefinition.relationEndpointWithListRole() = getEndpointTarget().relationEndpointWithListRole();
syn boolean EndpointDefinition.relationEndpointWithListRole() = getEndpointTarget().relationEndpointWithListRole();
...
@@ -546,30 +546,30 @@ aspect MustacheSendDefinition {
...
@@ -546,30 +546,30 @@ aspect MustacheSendDefinition {
syn String EndpointDefinition.writeMethodName() = toMustache().writeMethodName();
syn String EndpointDefinition.writeMethodName() = toMustache().writeMethodName();
// === attributes needed for computing above ones ===
// === attributes needed for computing above ones ===
syn boolean EndpointTarget.needForwarding
NTA
() = false;
syn boolean EndpointTarget.needForwarding() = false;
eq TypeEndpointTarget.needForwarding
NTA
() = containingEndpointDefinition().getSend() && !getType().getNTA();
eq TypeEndpointTarget.needForwarding() = containingEndpointDefinition().getSend() && !getType().getNTA();
eq RelationEndpointTarget.needForwarding
NTA
() = containingEndpointDefinition().getSend();
eq RelationEndpointTarget.needForwarding() = containingEndpointDefinition().getSend();
syn String EndpointTarget.forwarding
NTA_
Name() = null; // only needed, if needForwarding
NTA
evaluates to true
syn String EndpointTarget.forwardingName() = null; // only needed, if needForwarding evaluates to true
eq TypeEndpointTarget.forwarding
NTA_
Name() = ragconnect().internalRagConnectPrefix() + getType().getName();
eq TypeEndpointTarget.forwardingName() = ragconnect().internalRagConnectPrefix() + getType().getName();
eq RelationEndpointTarget.forwarding
NTA_
Name() = ragconnect().internalRagConnectPrefix() + getRole().getName();
eq RelationEndpointTarget.forwardingName() = ragconnect().internalRagConnectPrefix() + getRole().getName();
syn String EndpointTarget.forwarding
NTA_
Type() = null; // only needed, if needForwarding
NTA
evaluates to true
syn String EndpointTarget.forwardingType() = null; // only needed, if needForwarding evaluates to true
eq TypeEndpointTarget.forwarding
NTA_
Type() = getType().forwarding
NTA_
Type(
eq TypeEndpointTarget.forwardingType() = getType().forwardingType(
containingEndpointDefinition().getIndexBasedListAccess());
containingEndpointDefinition().getIndexBasedListAccess());
eq RelationEndpointTarget.forwarding
NTA_
Type() = getRole().forwarding
NTA_
Type(
eq RelationEndpointTarget.forwardingType() = getRole().forwardingType(
containingEndpointDefinition().getIndexBasedListAccess());
containingEndpointDefinition().getIndexBasedListAccess());
syn String TypeComponent.forwarding
NTA_
Type(boolean indexBasedListAccess);
syn String TypeComponent.forwardingType(boolean indexBasedListAccess);
eq NormalComponent.forwarding
NTA_
Type(boolean indexBasedListAccess) = getTypeDecl().getName();
eq NormalComponent.forwardingType(boolean indexBasedListAccess) = getTypeDecl().getName();
eq OptComponent.forwarding
NTA_
Type(boolean indexBasedListAccess) =
eq OptComponent.forwardingType(boolean indexBasedListAccess) =
ragconnect().configJastAddOpt() + "<" + getTypeDecl().getName() + ">";
ragconnect().configJastAddOpt() + "<" + getTypeDecl().getName() + ">";
eq ListComponent.forwarding
NTA_
Type(boolean indexBasedListAccess) = indexBasedListAccess ?
eq ListComponent.forwardingType(boolean indexBasedListAccess) = indexBasedListAccess ?
getTypeDecl().getName() :
getTypeDecl().getName() :
ragconnect().configJastAddList() + "<" + getTypeDecl().getName() + ">";
ragconnect().configJastAddList() + "<" + getTypeDecl().getName() + ">";
syn String Role.forwarding
NTA_
Type(boolean indexBasedListAccess) = oppositeRole().getType().getName();
syn String Role.forwardingType(boolean indexBasedListAccess) = oppositeRole().getType().getName();
eq ListRole.forwarding
NTA_
Type(boolean indexBasedListAccess) = indexBasedListAccess ?
eq ListRole.forwardingType(boolean indexBasedListAccess) = indexBasedListAccess ?
oppositeRole().getType().getName() :
oppositeRole().getType().getName() :
"java.util.List<" + oppositeRole().getType().getName() + ">";
"java.util.List<" + oppositeRole().getType().getName() + ">";
...
...
This diff is collapsed.
Click to expand it.
ragconnect.base/src/main/resources/sendDefinition.mustache
+
4
−
4
View file @
83180b42
...
@@ -159,8 +159,8 @@ protected void {{parentTypeName}}.{{writeMethodName}}({{#IndexBasedListAccess}}i
...
@@ -159,8 +159,8 @@ protected void {{parentTypeName}}.{{writeMethodName}}({{#IndexBasedListAccess}}i
{{
senderName
}}
.run(
{{#
IndexBasedListAccess
}}
index,
{{/
IndexBasedListAccess
}}
token);
{{
senderName
}}
.run(
{{#
IndexBasedListAccess
}}
index,
{{/
IndexBasedListAccess
}}
token);
}
}
{{#
needForwarding
NTA
}}
{{#
needForwarding
}}
syn
{{{
forwarding
NTA_
Type
}}}
{{
parentTypeName
}}
.
{{
forwarding
NTA_
Name
}}
(
{{#
IndexBasedListAccess
}}
int index
{{/
IndexBasedListAccess
}}
) {
syn
{{{
forwardingType
}}}
{{
parentTypeName
}}
.
{{
forwardingName
}}
(
{{#
IndexBasedListAccess
}}
int index
{{/
IndexBasedListAccess
}}
) {
{{#
relationEndpointWithListRole
}}
{{#
relationEndpointWithListRole
}}
// for (var element :
{{
realGetterMethodCall
}}
) {
// for (var element :
{{
realGetterMethodCall
}}
) {
// element.
{{
touchedTerminalsMethodName
}}
();
// element.
{{
touchedTerminalsMethodName
}}
();
...
@@ -169,11 +169,11 @@ syn {{{forwardingNTA_Type}}} {{parentTypeName}}.{{forwardingNTA_Name}}({{#IndexB
...
@@ -169,11 +169,11 @@ syn {{{forwardingNTA_Type}}} {{parentTypeName}}.{{forwardingNTA_Name}}({{#IndexB
return
{{
realGetterMethodCall
}}
;
return
{{
realGetterMethodCall
}}
;
{{/
relationEndpointWithListRole
}}
{{/
relationEndpointWithListRole
}}
{{^
relationEndpointWithListRole
}}
{{^
relationEndpointWithListRole
}}
{{{
forwarding
NTA_
Type
}}}
result =
{{
realGetterMethodCall
}}
;
{{{
forwardingType
}}}
result =
{{
realGetterMethodCall
}}
;
if (result == null) {
if (result == null) {
return null;
return null;
}
}
return result.
{{
touchedTerminalsMethodName
}}
();
return result.
{{
touchedTerminalsMethodName
}}
();
{{/
relationEndpointWithListRole
}}
{{/
relationEndpointWithListRole
}}
}
}
{{/
needForwarding
NTA
}}
{{/
needForwarding
}}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment