diff --git a/.gradle/6.8/executionHistory/executionHistory.bin b/.gradle/6.8/executionHistory/executionHistory.bin index 5d81b0de8b266ade615c14160b7417ae4ef3eb39..d0ddd8ad2e92440224b9fc21ed245a9efe86aa3d 100644 Binary files a/.gradle/6.8/executionHistory/executionHistory.bin and b/.gradle/6.8/executionHistory/executionHistory.bin differ diff --git a/.gradle/6.8/executionHistory/executionHistory.lock b/.gradle/6.8/executionHistory/executionHistory.lock index 0f5ce8d93ba0389c14577a216c51686eab1cf351..8a7a70c3a27aa7b0f62b39f7a76337b3353e66f5 100644 Binary files a/.gradle/6.8/executionHistory/executionHistory.lock and b/.gradle/6.8/executionHistory/executionHistory.lock differ diff --git a/.gradle/6.8/fileHashes/fileHashes.bin b/.gradle/6.8/fileHashes/fileHashes.bin index f8e7a2ea73261f9ec33689b47171d0704e8dd535..fccd77b71b3de6eff42e2c53c8efeaf0b1f7f1c5 100644 Binary files a/.gradle/6.8/fileHashes/fileHashes.bin and b/.gradle/6.8/fileHashes/fileHashes.bin differ diff --git a/.gradle/6.8/fileHashes/fileHashes.lock b/.gradle/6.8/fileHashes/fileHashes.lock index b59f4a003f11defb6f8208fbe306312d7c97d6c8..b2b03c2cf21831bc0e3c07be7127025392c78521 100644 Binary files a/.gradle/6.8/fileHashes/fileHashes.lock and b/.gradle/6.8/fileHashes/fileHashes.lock differ diff --git a/.gradle/6.8/javaCompile/javaCompile.lock b/.gradle/6.8/javaCompile/javaCompile.lock index 714ca7130c1cc02b817e36797fc3e9a94cbcbc5e..5e789334e9423d26ead4eb46e0268635b619c32e 100644 Binary files a/.gradle/6.8/javaCompile/javaCompile.lock and b/.gradle/6.8/javaCompile/javaCompile.lock differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 2f83ad44e555bd52d82a968be9291fc4a755ecb6..3fa5160693b4967d481603f15d786ebe45879481 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/ASTNode.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/ASTNode.class index b2d576410c3a8927fcd225f4f5e3c4d97d147504..47a471075b887f0e4ed581d488505ea079b7c43c 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/ASTNode.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/ASTNode.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Delete.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Delete.class index c20cb5f5e8f71b8d74679d2e649dfc78ed2a2586..946a75819f5c31b2d60e931d051c567a5a8a5b7a 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Delete.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Delete.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Get.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Get.class index 4cde8ea26300be3713b8bc26e46a136d5dc22929..8b0319c47ef4c9eff0ee8eefd5e612cd92504b32 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Get.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Get.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Head.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Head.class index 862d002e51ce4a70b48d7a2021cb444d4372863c..68fc64e7f95988140ab4cb1bd8566590133d3d63 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Head.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Head.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OpenAPIObject.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OpenAPIObject.class index a1b2f1a66f7ae5506de373e89fcd08b54467fc9d..23702a402eb12f7e444bbfb67c034c5c6f9c9285 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OpenAPIObject.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OpenAPIObject.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationOb.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationOb.class index bce689358f12824d5cde973240501171c2ed5bda..cb9fad66d58723b48f07b10c199ba768e2709dec 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationOb.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationOb.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationObject.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationObject.class index 7540a4275c8790ecf234c75fdc925259106af4dd..960c9e9a8df64bc50d00b061b12b284a38d5c51b 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationObject.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/OperationObject.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Options.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Options.class index b8aac92fe9221f164c01aea8e3c4dda5b5ef8a96..abc57dc2765cdc169b420c27b750b55651c3c1d6 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Options.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Options.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Patch.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Patch.class index 6adae5e67652be4af06454b39c6dbb0f53187b05..461d0d8e6ea55995122bcfbeaad3e7c136dfd684 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Patch.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Patch.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Post.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Post.class index 45ef2d9237189745e9cf821d16c93c263c39bfa4..6e3f6a9c3f1e6df718ce7555ca15e7eb1c3c4969 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Post.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Post.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Put.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Put.class index 9c659c63b52e3cb0cba64fe507f2804efa35f446..890a9ece0697a97dd75126ceabb5d629e0c1811c 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Put.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Put.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaOb.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaOb.class index be61b94982e001ef8ef6fbfcb851f62a7a7db4ee..9a0cae0b1904ef9c15927683991a5c53f6421ace 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaOb.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaOb.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaObject.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaObject.class index a1a90d0072063c7d0ec701bd72f1ee6f003558df..6b895842997a5244a403e943cca4204c684c5524 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaObject.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/SchemaObject.class differ diff --git a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Trace.class b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Trace.class index 2950f2ef00fd7a8667f24975e076ba339d6036fc..3587580120f04a5e40733cb0129a34eca1b14079 100644 Binary files a/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Trace.class and b/build/classes/java/main/de/tudresden/inf/st/openapi/ast/Trace.class differ diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ASTNode.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ASTNode.java index ed1ca00311306cb1f3981416c08d0d9a9763c3d5..549b93a58092fd7144526260d870c0c023b11ca4 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ASTNode.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ASTNode.java @@ -484,6 +484,20 @@ public class ASTNode<T extends ASTNode> implements Cloneable { } return true; } + /** + * @aspect <NoAspect> + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\InfSchema.jrag:14 + */ + /** @apilevel internal */ + protected void collect_contributors_OpenAPIObject_schemas(OpenAPIObject _root, java.util.Map<ASTNode, java.util.Set<ASTNode>> _map) { + for (int i = 0; i < getNumChild(); i++) { + getChild(i).collect_contributors_OpenAPIObject_schemas(_root, _map); + } + } + /** @apilevel internal */ + protected void contributeTo_OpenAPIObject_schemas(java.util.Set<SchemaObject> collection) { + } + /** @apilevel internal */ public ASTNode rewriteTo() { return this; diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/CallbackOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/CallbackOb.java index ad808103010c25f1295abfda29050e725210a745..8a20750386ec0cea94a41697a93a7e9ab67845dc 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/CallbackOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/CallbackOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class CallbackOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:482 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:506 */ public static CallbackOb parseCallback(Callback callback, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { CallbackObject callbackObject = new CallbackObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ComponentsObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ComponentsObject.java index 7dc5938f86894e054f17d62f94b4d3c3536ae01a..91b85cd9f4928d6c751314b077d9687042417b2c 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ComponentsObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ComponentsObject.java @@ -118,7 +118,7 @@ public class ComponentsObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:142 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:166 */ public static ComponentsObject parseComponents(Components components, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { ComponentsObject componentsObject = new ComponentsObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ContactObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ContactObject.java index 510b65891fcf856fe8d9bad42e3c417960d1ff26..6dee87268b3678dd230e343664d2ce74d41c645c 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ContactObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ContactObject.java @@ -49,7 +49,7 @@ public class ContactObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:68 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:92 */ public static ContactObject parseContact(Contact contact, Map<Object, ASTNode> map){ ContactObject contactObject = new ContactObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Delete.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Delete.java index ebd40cb0d483b5270f34c8c8482b81b233d643c4..d79dba97aa4dc7fd4732645d4a74f363d6902226 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Delete.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Delete.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/DiscriminatorObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/DiscriminatorObject.java index a4fdd64dcd6fa494bf68b788a5a4ade47744468e..5dbf5fce78e55c1570bdbed6041e8b8245bfa21d 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/DiscriminatorObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/DiscriminatorObject.java @@ -44,7 +44,7 @@ public class DiscriminatorObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:752 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:777 */ public static DiscriminatorObject parseDiscriminator (Discriminator discriminator, Map<Object, ASTNode> map) { DiscriminatorObject discriminatorObject = new DiscriminatorObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/EncodingObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/EncodingObject.java index 65618cf6050c5793d9c7111e8ccca858bea9cd0c..733ff59f0b4bf89e5a5f47cff7ff7e9d96877f50 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/EncodingObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/EncodingObject.java @@ -56,7 +56,7 @@ public class EncodingObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:427 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:451 */ public static EncodingObject parseEncoding(EncodingProperty encodingProperty, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { EncodingObject encodingObject = new EncodingObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ExampleObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ExampleObject.java index bfa74789c2292227fcb883a313d92520efdb3db0..3368d94202b31ed358ad03ce06158fc8fa1a6b86 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ExampleObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ExampleObject.java @@ -50,7 +50,7 @@ public class ExampleObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:505 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:529 */ public static ExampleObject parseExample(Example example, OAIContext context, Map<Object, ASTNode> map){ ExampleObject exampleObject = new ExampleObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ExternalDocObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ExternalDocObject.java index 67056a7f178c0d39e28ad19ec031eb741298b837..717d648d338d6b16b9b98f5f6ba2b2187f43542c 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ExternalDocObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ExternalDocObject.java @@ -46,7 +46,7 @@ public class ExternalDocObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:312 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:336 */ public static ExternalDocObject parseExternalDocs(ExternalDocs externalDocs, Map<Object, ASTNode> map){ ExternalDocObject externalDocObject = new ExternalDocObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Get.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Get.java index 20949dd1980a28264fdbf52040bc0d0f26155bc4..f696d4754504c8a74da68ebe37395da1962d624e 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Get.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Get.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Head.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Head.java index 2db5dd6d196a0aeaa3e5992f386e33cb01a484b2..5ece025707cc2873f0701a7fc193d549c965d61d 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Head.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Head.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/HeaderOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/HeaderOb.java index 5153fa6f2fdf5aab5cb8e1955eaf5799adc017fd..b9fe98e39c3ddec2731bc2a0d3997f5c9bd37311 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/HeaderOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/HeaderOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class HeaderOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:561 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:585 */ public static HeaderOb parseHeader(Header header, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { HeaderObject headerObject = new HeaderObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/InfoObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/InfoObject.java index 981174b22438e4d77cd3fe683fbef23c4c46ca7a..52a38950765b4aed60e18a45e7473f588ab8c428 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/InfoObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/InfoObject.java @@ -55,7 +55,7 @@ public class InfoObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:44 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:68 */ public static InfoObject parseInfo(Info info, Map<Object, ASTNode> map) { InfoObject infoObject = new InfoObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/LicenseObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/LicenseObject.java index 000bc13e1d756881b660760c5ff587415a0000ad..e52d0d936c9fe3d6545d00d97fc54be1d6141193 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/LicenseObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/LicenseObject.java @@ -47,7 +47,7 @@ public class LicenseObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:86 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:110 */ public static LicenseObject parseLicense(License license, Map<Object, ASTNode> map){ LicenseObject licenseObject = new LicenseObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/LinkOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/LinkOb.java index 827c3456775a7501dcf271e7ea0976bd597f29c8..4f69f47cb720be4cad01c478e4b0e7ba8e407f69 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/LinkOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/LinkOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class LinkOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:530 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:554 */ public static LinkOb parseLink(Link link, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { LinkObject linkObject = new LinkObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/MediaTypeObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/MediaTypeObject.java index b1d926441ad3a74dbd073a031c0d481f3f3acaaa..b2a8375ba6d4b607951b873b22e041346d7e99aa 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/MediaTypeObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/MediaTypeObject.java @@ -54,7 +54,7 @@ public class MediaTypeObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:403 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:427 */ public static MediaTypeObject parseMediaType(MediaType mediaType, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { MediaTypeObject mediaTypeObject = new MediaTypeObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowObject.java index 0c7cfd0720b9d9a59758951e9f7e6d8563319d52..abe1e8f2f7eb998acb79114415aac23435aa6588 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowObject.java @@ -47,7 +47,7 @@ public class OAuthFlowObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:852 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:877 */ public static OAuthFlowObject parseOAuthFlow(OAuthFlow oAuthFlow, Map<Object, ASTNode> map){ OAuthFlowObject oAuthFlowObject = new OAuthFlowObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowsObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowsObject.java index 15faf4ab2a0366d858d90324d5802b9543ad2c2b..02bad3b4ab63d2db3271749dc202645dd4013961 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowsObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/OAuthFlowsObject.java @@ -44,7 +44,7 @@ public class OAuthFlowsObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:820 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:845 */ public static OAuthFlowsObject parseOAuthFlows(OAuthFlows oAuthFlows, Map<Object, ASTNode> map){ OAuthFlowsObject oAuthFlowsObject = new OAuthFlowsObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/OpenAPIObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/OpenAPIObject.java index 403e7cd73b394e64bca09c902d0129b737c0590a..12e31ff90255f7e373dcfe36192e9b9d6356999c 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/OpenAPIObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/OpenAPIObject.java @@ -115,6 +115,30 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { } map.put(api, openapi); + int a = 0; + Set<ResponseObject> responseObjects = new HashSet<>(); + Set<Response> responses = new HashSet<>(); + for( Object o : map.keySet() ){ + + if( map.get(o) instanceof ResponseObject ){ + if(!responseObjects.contains(map.get(o))){ + responseObjects.add((ResponseObject) map.get(o)); + a++; + } + } + + /* + if( map.get(o) instanceof SchemaObject ){ + if(schemas.contains(map.get(o))){ + schemas.add((SchemaObject) map.get(o)); + a++; + } + } + + */ + } + + System.out.println("size of ResponseObjects: " + a); return openapi; } /** @@ -252,16 +276,20 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { */ public void flushCollectionCache() { super.flushCollectionCache(); + OpenAPIObject_schemas_visited = false; + OpenAPIObject_schemas_computed = null; + OpenAPIObject_schemas_value = null; + contributorMap_OpenAPIObject_schemas = null; } /** @apilevel internal - * @declaredat ASTNode:57 + * @declaredat ASTNode:61 */ public OpenAPIObject clone() throws CloneNotSupportedException { OpenAPIObject node = (OpenAPIObject) super.clone(); return node; } /** @apilevel internal - * @declaredat ASTNode:62 + * @declaredat ASTNode:66 */ public OpenAPIObject copy() { try { @@ -281,7 +309,7 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { * @return dangling copy of the subtree at this node * @apilevel low-level * @deprecated Please use treeCopy or treeCopyNoTransform instead - * @declaredat ASTNode:81 + * @declaredat ASTNode:85 */ @Deprecated public OpenAPIObject fullCopy() { @@ -292,7 +320,7 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { * The copy is dangling, i.e. has no parent. * @return dangling copy of the subtree at this node * @apilevel low-level - * @declaredat ASTNode:91 + * @declaredat ASTNode:95 */ public OpenAPIObject treeCopyNoTransform() { OpenAPIObject tree = (OpenAPIObject) copy(); @@ -313,7 +341,7 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { * The copy is dangling, i.e. has no parent. * @return dangling copy of the subtree at this node * @apilevel low-level - * @declaredat ASTNode:111 + * @declaredat ASTNode:115 */ public OpenAPIObject treeCopy() { OpenAPIObject tree = (OpenAPIObject) copy(); @@ -329,7 +357,7 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { return tree; } /** @apilevel internal - * @declaredat ASTNode:125 + * @declaredat ASTNode:129 */ protected boolean is$Equal(ASTNode node) { return super.is$Equal(node) && (tokenString_OpenAPI == ((OpenAPIObject) node).tokenString_OpenAPI) && (tokenOAIContext_Context == ((OpenAPIObject) node).tokenOAIContext_Context); @@ -1077,6 +1105,21 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { public JastAddList<Extension> getExtensionsNoTransform() { return getExtensionListNoTransform(); } + /** + * @aspect <NoAspect> + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\InfSchema.jrag:14 + */ + /** @apilevel internal */ +protected java.util.Map<ASTNode, java.util.Set<ASTNode>> contributorMap_OpenAPIObject_schemas = null; + + /** @apilevel internal */ + protected void survey_OpenAPIObject_schemas() { + if (contributorMap_OpenAPIObject_schemas == null) { + contributorMap_OpenAPIObject_schemas = new java.util.IdentityHashMap<ASTNode, java.util.Set<ASTNode>>(); + collect_contributors_OpenAPIObject_schemas(this, contributorMap_OpenAPIObject_schemas); + } + } + /** * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:84 * @apilevel internal @@ -1115,4 +1158,55 @@ public class OpenAPIObject extends ASTNode<ASTNode> implements Cloneable { public boolean canRewrite() { return false; } +/** @apilevel internal */ +protected boolean OpenAPIObject_schemas_visited = false; + /** + * @attribute coll + * @aspect InfSchema + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\InfSchema.jrag:14 + */ + @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.COLL) + @ASTNodeAnnotation.Source(aspect="InfSchema", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\InfSchema.jrag:14") + public java.util.Set<SchemaObject> schemas() { + ASTState state = state(); + if (OpenAPIObject_schemas_computed == ASTState.NON_CYCLE || OpenAPIObject_schemas_computed == state().cycle()) { + return OpenAPIObject_schemas_value; + } + if (OpenAPIObject_schemas_visited) { + throw new RuntimeException("Circular definition of attribute OpenAPIObject.schemas()."); + } + OpenAPIObject_schemas_visited = true; + OpenAPIObject_schemas_value = schemas_compute(); + if (state().inCircle()) { + OpenAPIObject_schemas_computed = state().cycle(); + + } else { + OpenAPIObject_schemas_computed = ASTState.NON_CYCLE; + + } + OpenAPIObject_schemas_visited = false; + return OpenAPIObject_schemas_value; + } + /** @apilevel internal */ + private java.util.Set<SchemaObject> schemas_compute() { + ASTNode node = this; + while (node != null && !(node instanceof OpenAPIObject)) { + node = node.getParent(); + } + OpenAPIObject root = (OpenAPIObject) node; + root.survey_OpenAPIObject_schemas(); + java.util.Set<SchemaObject> _computedValue = new java.util.HashSet<>(); + if (root.contributorMap_OpenAPIObject_schemas.containsKey(this)) { + for (ASTNode contributor : root.contributorMap_OpenAPIObject_schemas.get(this)) { + contributor.contributeTo_OpenAPIObject_schemas(_computedValue); + } + } + return _computedValue; + } + /** @apilevel internal */ + protected ASTState.Cycle OpenAPIObject_schemas_computed = null; + + /** @apilevel internal */ + protected java.util.Set<SchemaObject> OpenAPIObject_schemas_value; + } diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationOb.java index 4b56562e5596b1fe8cfc5e56d062a1e405386678..a6166bb499cd120862abc0de0c2bf5f129f51092 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationOb.java @@ -101,10 +101,10 @@ public abstract class OperationOb extends ASTNode<ASTNode> implements Cloneable /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public abstract String generateRandomUrl(String pathRef, OperationObject operationObject); /** @apilevel internal */ public ASTNode rewriteTo() { diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationObject.java index 9dfbf25233321b4524877b0b919587c99bd34c9f..0020ec517e26c42fcbdbf18f73a421a1c6582248 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/OperationObject.java @@ -82,7 +82,7 @@ public class OperationObject extends OperationOb implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:261 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:285 */ public static OperationObject parseOperation(Operation operation, OAIContext context, Map<Object, ASTNode> map) throws DecodeException{ OperationObject operationObject = new OperationObject(); @@ -136,7 +136,7 @@ public class OperationObject extends OperationOb implements Cloneable { } /** * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:253 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:229 */ public String generateRandomString(Random rand, JastAddList<EnumObj> objs) { if( objs.getNumChild() != 0 ) @@ -150,7 +150,7 @@ public class OperationObject extends OperationOb implements Cloneable { } /** * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:264 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:240 */ public String generateRandomInt(Random rand, int minimum, int maximum){ if( minimum > -1 && maximum > 0 ) @@ -1293,10 +1293,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Options.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Options.java index 35a85b504e06f2260bac28c540dc2192167dc555..7cd649723094719fbbdd215ee2a1372b7df7e479 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Options.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Options.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ParameterOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ParameterOb.java index 2727a42f0927ab738eaaf0702c1a4e8bd42f9ba9..74334497f27b424bba908292c2335d93c1c6af40 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ParameterOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ParameterOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class ParameterOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:329 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:353 */ public static ParameterOb parseParameter(Parameter parameter, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { ParameterObject parameterObject = new ParameterObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Patch.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Patch.java index c9f6b9f824dd4309216657d410cf0b1fac748219..33502f9ac7b65d4f40305349137fa70603822d25 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Patch.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Patch.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/PathItemOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/PathItemOb.java index 50fddea000403635b8a9af34d1c18c042369bf93..02c82df48ef14dd7b021620fdf04b3b343fbe1e6 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/PathItemOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/PathItemOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class PathItemOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:190 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:214 */ public static PathItemOb parsePath(Path path, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { PathItemObject pathItem = new PathItemObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Post.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Post.java index 772521ad5c37536d06fb98ff56e23df3b606fa1c..41789618e795127d2822a2f0e0e77d97c5122f3e 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Post.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Post.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Put.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Put.java index 25c42c2ff4015562def65cc490390cd8e52944f1..133e67b48da78927a831c5e820713c0e34a8d04b 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Put.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Put.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/RequestBodyOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/RequestBodyOb.java index b0e2c94553b5b72250a22f875f4c9010ed424044..203e71bedcb3ec565ecc10755d3f6767dd76b0bd 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/RequestBodyOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/RequestBodyOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class RequestBodyOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:376 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:400 */ public static RequestBodyOb parseRequestBody(org.openapi4j.parser.model.v3.RequestBody requestBody, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { RequestBodyObject requestBodyObject = new RequestBodyObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ResponseOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ResponseOb.java index d0beabef5f0e910e029a62ef174762d6c65c6930..fa8fb7c1862dd2c80f05dcbdcf6e6f42a5c6d2a2 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ResponseOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ResponseOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class ResponseOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:449 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:473 */ public static ResponseOb parseResponse(Response response, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { ResponseObject responseObject = new ResponseObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaOb.java index 4d286e94de2908bf200eacced710d13b26202669..ad1b8f36c99220255aea94b1a317bd6fc5d038c2 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class SchemaOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:626 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:650 */ public static SchemaOb parseSchema (org.openapi4j.parser.model.v3.Schema schema, OAIContext context, Map<Object, ASTNode> map) throws DecodeException { SchemaObject schemaObject = new SchemaObject(); @@ -35,6 +35,7 @@ public abstract class SchemaOb extends ASTNode<ASTNode> implements Cloneable { SchemaReference s = new SchemaReference(); s.setRef(schema.getRef()); s.setSchemaOb(parseSchema(schema.getReference(context).getMappedContent(Schema.class), context, map)); + System.out.println(s.getRef()); return s; } else { if( schema.getAdditionalProperties() != null ) diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaObject.java index b33a59dc0d299ee29ae9d7ce77b27474d0de6029..3e10c0f0c75a910d536057a391d3cda2a1e601cd 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/SchemaObject.java @@ -1938,4 +1938,22 @@ protected boolean schemaObject_visited = false; public boolean canRewrite() { return false; } + /** @apilevel internal */ + protected void collect_contributors_OpenAPIObject_schemas(OpenAPIObject _root, java.util.Map<ASTNode, java.util.Set<ASTNode>> _map) { + // @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\InfSchema.jrag:15 + { + java.util.Set<ASTNode> contributors = _map.get(_root); + if (contributors == null) { + contributors = new java.util.LinkedHashSet<ASTNode>(); + _map.put((ASTNode) _root, contributors); + } + contributors.add(this); + } + super.collect_contributors_OpenAPIObject_schemas(_root, _map); + } + /** @apilevel internal */ + protected void contributeTo_OpenAPIObject_schemas(java.util.Set<SchemaObject> collection) { + super.contributeTo_OpenAPIObject_schemas(collection); + collection.add(this); + } } diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/SecurityRequirementObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/SecurityRequirementObject.java index 36a250d21832cad6bc56020d6aba9d4b640866a5..8e55539d499068a1674300381c25fd8eb66efee0 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/SecurityRequirementObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/SecurityRequirementObject.java @@ -46,7 +46,7 @@ public class SecurityRequirementObject extends ASTNode<ASTNode> implements Clone } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:872 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:897 */ public static SecurityRequirementObject parseSecurityRequirement(SecurityRequirement securityRequirement, Map<Object, ASTNode> map){ SecurityRequirementObject securityRequirementObject = new SecurityRequirementObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/SecuritySchemeOb.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/SecuritySchemeOb.java index 14d9ff79fcb59a99970948c7c0a037d4a193246b..c8448a9eaf704e7743c845aa4b8f39b831a12af0 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/SecuritySchemeOb.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/SecuritySchemeOb.java @@ -26,7 +26,7 @@ import java.util.stream.IntStream; public abstract class SecuritySchemeOb extends ASTNode<ASTNode> implements Cloneable { /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:792 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:817 */ public static SecuritySchemeOb parseSecurityScheme(SecurityScheme securityScheme, OAIContext context, Map<Object, ASTNode> map){ SecuritySchemeObject securitySchemeObject = new SecuritySchemeObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerObject.java index 90d2d5607617687a78aa2f162757da040fc19773..fb957f073ac3c36ebf93bc69e28ca8b6e4e24173 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerObject.java @@ -53,7 +53,7 @@ public class ServerObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:102 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:126 */ public static ServerObject parseServer(Server server, Map<Object, ASTNode> map){ ServerObject serverObject = new ServerObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerVariableObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerVariableObject.java index 5c0cf4971f6f389228d5f720115b6d6d765b2222..d0206817777df7cc1791c8520f8a8653e5e3602b 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerVariableObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/ServerVariableObject.java @@ -53,7 +53,7 @@ public class ServerVariableObject extends ASTNode<ASTNode> implements Cloneable } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:122 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:146 */ public static ServerVariableObject parseServerVariable(ServerVariable serverVariable, Map<Object, ASTNode> map){ ServerVariableObject serverVariableObject = new ServerVariableObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/TagObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/TagObject.java index 2a1e5c572decb682906924954df8ecfcfa65b314..bf0d724b0e449a9ddb73af356cd2c91fb55cf82b 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/TagObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/TagObject.java @@ -48,7 +48,7 @@ public class TagObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:604 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:628 */ public static TagObject parseTag(org.openapi4j.parser.model.v3.Tag tag, Map<Object, ASTNode> map){ TagObject tagObject = new TagObject(); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/Trace.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/Trace.java index 33d96ee0d6fb36e84265d8be3b8733326fdca1ca..e2df33b4b81485a78f98c0e7c167f3ee7375a13a 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/Trace.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/Trace.java @@ -181,10 +181,10 @@ protected java.util.Set generateRandomUrl_String_OperationObject_visited; /** * @attribute syn * @aspect RandomRequestGenerator - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95 */ @ASTNodeAnnotation.Attribute(kind=ASTNodeAnnotation.Kind.SYN) - @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:119") + @ASTNodeAnnotation.Source(aspect="RandomRequestGenerator", declaredAt="E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\RandomRequestGenerator.jrag:95") public String generateRandomUrl(String pathRef, OperationObject operationObject) { java.util.List _parameters = new java.util.ArrayList(2); _parameters.add(pathRef); diff --git a/src/gen/java/de/tudresden/inf/st/openapi/ast/XmlObject.java b/src/gen/java/de/tudresden/inf/st/openapi/ast/XmlObject.java index d546aa15e420b496ad0af8720ba3a05c16fab2af..db05e4c0497a2eadca9c7caf3933819f8d3914c1 100644 --- a/src/gen/java/de/tudresden/inf/st/openapi/ast/XmlObject.java +++ b/src/gen/java/de/tudresden/inf/st/openapi/ast/XmlObject.java @@ -46,7 +46,7 @@ public class XmlObject extends ASTNode<ASTNode> implements Cloneable { } /** * @aspect Parser - * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:770 + * @declaredat E:\\bachelor-thesis\\SigTest\\bachelor-thesis-jastadd\\src\\main\\jastadd\\Parser.jrag:795 */ public static XmlObject parseXml (Xml xml, Map<Object, ASTNode> map) { XmlObject xmlObject = new XmlObject(); diff --git a/src/main/jastadd/InfSchema.jrag b/src/main/jastadd/InfSchema.jrag index 01a895fbe59779dede04f7a8cf1fa683869851b0..a2c7e8b65becdb7885037b510642a8ae52b90a47 100644 --- a/src/main/jastadd/InfSchema.jrag +++ b/src/main/jastadd/InfSchema.jrag @@ -1,6 +1,16 @@ aspect InfSchema { - syn SchemaObject ParameterObject.schemaObject () = getSchemaOb().schemaObject(); + syn SchemaObject ParameterObject.schemaObject() = getSchemaOb().schemaObject(); // syn Set<SchemaObject> ResponseObject.schemaObject () = for( ContentTuple c : getContentTuples() ) add.SchemaObject(); + + + /* + coll Set<SchemaOb> OpenAPIObject.collectSchemaObs() [new HashSet<>()] root OpenAPIObject; + SchemaOb contributes this + when schemaObject() + to OpenAPIObject.collectSchemaObs(); + */ + coll java.util.Set<SchemaObject> OpenAPIObject.schemas() [new java.util.HashSet<>()] root OpenAPIObject; + SchemaObject contributes this to OpenAPIObject.schemas(); } \ No newline at end of file diff --git a/src/main/jastadd/Parser.jrag b/src/main/jastadd/Parser.jrag index f432f5a70b06ccaff575b893c95b2d95de063f0a..e100db37b8a3b8fcf253897dc8e0723841d1d0e2 100644 --- a/src/main/jastadd/Parser.jrag +++ b/src/main/jastadd/Parser.jrag @@ -38,6 +38,7 @@ public static OpenAPIObject OpenAPIObject.parseOpenAPI(OpenApi3 api) throws IOEx } map.put(api, openapi); + return openapi; } diff --git a/src/main/jastadd/RandomRequestGenerator.jrag b/src/main/jastadd/RandomRequestGenerator.jrag index a7a95e6b0a056e224a5a8fb9e11f6ff7feca2efb..a6c5eaae630c11bcc87ecc448a8e0cbdd3ec9755 100644 --- a/src/main/jastadd/RandomRequestGenerator.jrag +++ b/src/main/jastadd/RandomRequestGenerator.jrag @@ -92,30 +92,6 @@ aspect RandomRequestGenerator { return urls; } - /* - public Set<String> PathsObject.sendRandomRequests(Set<String> generatedUrls) throws Exception { - if( this.getPathItemOb().pathItemObject().hasGet() ){ - IntStream.range(0, 1).forEach( i -> { - try { - generatedUrls.add(this.getPathItemOb().pathItemObject().getGet().generateRandomUrl(this.getRef(), this.getPathItemOb().pathItemObject().getGet().getOperationObject())); - } catch (Exception e) { - e.printStackTrace(); - } - }); - } - if( this.getPathItemOb().pathItemObject().hasPost() ){ - IntStream.range(0, 1).forEach( i -> { - try { - generatedUrls.add(this.getPathItemOb().pathItemObject().getPost().generateRandomUrl(this.getRef(), this.getPathItemOb().pathItemObject().getPost().getOperationObject())); - } catch (Exception e) { - e.printStackTrace(); - } - });} - - return generatedUrls; - } - */ - syn String OperationOb.generateRandomUrl(String pathRef, OperationObject operationObject); eq Get.generateRandomUrl(String pathRef, OperationObject operationObject) { Random rand = new Random();