Skip to content
Snippets Groups Projects
Commit 234a68f1 authored by René Schöne's avatar René Schöne
Browse files

Only generate mappings if they are used.

parent b37dc5ee
No related branches found
No related tags found
1 merge request!4Resolve "Subtree update"
Pipeline #9066 failed
Stage: build
Stage: test
Stage: ragdoc_build
Stage: ragdoc_view
Show whitespace changes
Inline Side-by-side
ragconnect.base/src/main/jastadd/Analysis.jrag
+ 9
− 0
View file @ 234a68f1
......@@ -86,4 +86,13 @@ aspect Analysis {
// --- needProxyToken ---
syn boolean TokenComponent.needProxyToken() = !getDependencySourceDefinitionList().isEmpty() || getTokenEndpointDefinitionList().stream().anyMatch(TokenEndpointDefinition::shouldSendValue);
// --- effectiveUsedAt ---
coll Set<EndpointDefinition> MappingDefinition.effectiveUsedAt()
[new java.util.HashSet<EndpointDefinition>()]
root RagConnect;
EndpointDefinition contributes this
to MappingDefinition.effectiveUsedAt()
for each effectiveMappings();
}
ragconnect.base/src/main/jastadd/intermediate/Generation.jadd
+ 4
− 0
View file @ 234a68f1
......@@ -134,6 +134,10 @@ aspect AttributesForMustache {
syn String MMappingDefinition.fromType() = getMappingDefinition().getFromType().prettyPrint();
syn String MMappingDefinition.fromVariableName() = getMappingDefinition().getFromVariableName();
syn String MMappingDefinition.content() = getMappingDefinition().getContent();
syn boolean MMappingDefinition.isUsed() {
System.out.println(getMappingDefinition().getID() + ": " + getMappingDefinition().effectiveUsedAt());
return !getMappingDefinition().effectiveUsedAt().isEmpty();
}
// --- MDependencyDefinition ---
syn String MDependencyDefinition.targetParentTypeName() = getDependencyDefinition().getTarget().containingTypeDecl().getName();
......
ragconnect.base/src/main/resources/ragconnect.mustache
+ 2
− 0
View file @ 234a68f1
......@@ -18,7 +18,9 @@ aspect RagConnect {
{{/TypeSendDefinitions}}
{{#MappingDefinitions}}
{{#isUsed}}
{{> mappingDefinition}}
{{/isUsed}}
{{/MappingDefinitions}}
{{#DependencyDefinitions}}
......
ragconnect.tests/src/test/java/org/jastadd/ragconnect/tests/TestUtils.java
+ 71
− 19
View file @ 234a68f1
package org.jastadd.ragconnect.tests;
import defaultOnlyRead.ast.ASTNode;
import java.io.File;
import java.io.IOException;
import java.nio.charset.Charset;
......@@ -74,10 +72,64 @@ public class TestUtils {
}
@SuppressWarnings({"unused", "rawtypes"})
static class DefaultMappings extends ASTNode {
static class DefaultMappings {
static class ReadNode extends defaultOnlyRead.ast.ASTNode {
public static boolean _apply__DefaultBytesToBooleanMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToBooleanMapping(input);
}
public static int _apply__DefaultBytesToIntMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToIntMapping(input);
}
public static short _apply__DefaultBytesToShortMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToShortMapping(input);
}
public static long _apply__DefaultBytesToLongMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToLongMapping(input);
}
public static float _apply__DefaultBytesToFloatMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToFloatMapping(input);
}
public static double _apply__DefaultBytesToDoubleMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToDoubleMapping(input);
}
public static char _apply__DefaultBytesToCharMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToCharMapping(input);
}
public static String _apply__DefaultBytesToStringMapping(byte[] input) throws Exception {
return defaultOnlyRead.ast.ASTNode._apply__DefaultBytesToStringMapping(input);
}
}
static class WriteNode extends defaultOnlyWrite.ast.ASTNode {
public static byte[] _apply__DefaultBooleanToBytesMapping(boolean input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultBooleanToBytesMapping(input);
}
public static byte[] _apply__DefaultIntToBytesMapping(int input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultIntToBytesMapping(input);
}
public static byte[] _apply__DefaultShortToBytesMapping(short input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultShortToBytesMapping(input);
}
public static byte[] _apply__DefaultLongToBytesMapping(long input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultLongToBytesMapping(input);
}
public static byte[] _apply__DefaultFloatToBytesMapping(float input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultFloatToBytesMapping(input);
}
public static byte[] _apply__DefaultDoubleToBytesMapping(double input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultDoubleToBytesMapping(input);
}
public static byte[] _apply__DefaultCharToBytesMapping(char input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultCharToBytesMapping(input);
}
public static byte[] _apply__DefaultStringToBytesMapping(String input) throws Exception {
return defaultOnlyWrite.ast.ASTNode._apply__DefaultStringToBytesMapping(input);
}
}
public static boolean BytesToBool(byte[] input) {
try {
return _apply__DefaultBytesToBooleanMapping(input);
return ReadNode._apply__DefaultBytesToBooleanMapping(input);
} catch (Exception e) {
e.printStackTrace();
return false;
......@@ -85,7 +137,7 @@ public class TestUtils {
}
public static int BytesToInt(byte[] input) {
try {
return _apply__DefaultBytesToIntMapping(input);
return ReadNode._apply__DefaultBytesToIntMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -93,7 +145,7 @@ public class TestUtils {
}
public static short BytesToShort(byte[] input) {
try {
return _apply__DefaultBytesToShortMapping(input);
return ReadNode._apply__DefaultBytesToShortMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -101,7 +153,7 @@ public class TestUtils {
}
public static long BytesToLong(byte[] input) {
try {
return _apply__DefaultBytesToLongMapping(input);
return ReadNode._apply__DefaultBytesToLongMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -109,7 +161,7 @@ public class TestUtils {
}
public static float BytesToFloat(byte[] input) {
try {
return _apply__DefaultBytesToFloatMapping(input);
return ReadNode._apply__DefaultBytesToFloatMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -117,7 +169,7 @@ public class TestUtils {
}
public static double BytesToDouble(byte[] input) {
try {
return _apply__DefaultBytesToDoubleMapping(input);
return ReadNode._apply__DefaultBytesToDoubleMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -125,7 +177,7 @@ public class TestUtils {
}
public static char BytesToChar(byte[] input) {
try {
return _apply__DefaultBytesToCharMapping(input);
return ReadNode._apply__DefaultBytesToCharMapping(input);
} catch (Exception e) {
e.printStackTrace();
return 0;
......@@ -133,7 +185,7 @@ public class TestUtils {
}
public static String BytesToString(byte[] input) {
try {
return _apply__DefaultBytesToStringMapping(input);
return ReadNode._apply__DefaultBytesToStringMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -141,7 +193,7 @@ public class TestUtils {
}
public static byte[] BoolToBytes(boolean input) {
try {
return _apply__DefaultBooleanToBytesMapping(input);
return WriteNode._apply__DefaultBooleanToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -149,7 +201,7 @@ public class TestUtils {
}
public static byte[] IntToBytes(int input) {
try {
return _apply__DefaultIntToBytesMapping(input);
return WriteNode._apply__DefaultIntToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -157,7 +209,7 @@ public class TestUtils {
}
public static byte[] ShortToBytes(short input) {
try {
return _apply__DefaultShortToBytesMapping(input);
return WriteNode._apply__DefaultShortToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -165,7 +217,7 @@ public class TestUtils {
}
public static byte[] LongToBytes(long input) {
try {
return _apply__DefaultLongToBytesMapping(input);
return WriteNode._apply__DefaultLongToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -173,7 +225,7 @@ public class TestUtils {
}
public static byte[] FloatToBytes(float input) {
try {
return _apply__DefaultFloatToBytesMapping(input);
return WriteNode._apply__DefaultFloatToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -181,7 +233,7 @@ public class TestUtils {
}
public static byte[] DoubleToBytes(double input) {
try {
return _apply__DefaultDoubleToBytesMapping(input);
return WriteNode._apply__DefaultDoubleToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -189,7 +241,7 @@ public class TestUtils {
}
public static byte[] CharToBytes(char input) {
try {
return _apply__DefaultCharToBytesMapping(input);
return WriteNode._apply__DefaultCharToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......@@ -197,7 +249,7 @@ public class TestUtils {
}
public static byte[] StringToBytes(String input) {
try {
return _apply__DefaultStringToBytesMapping(input);
return WriteNode._apply__DefaultStringToBytesMapping(input);
} catch (Exception e) {
e.printStackTrace();
return null;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment