Skip to content
Snippets Groups Projects
Commit 0fafce7c authored by Jueun Park's avatar Jueun Park
Browse files

Update

parent 9a9dfac6
No related branches found
No related tags found
No related merge requests found
Showing
with 57 additions and 27 deletions
......@@ -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);
......
......@@ -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);
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
......@@ -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);
......
......@@ -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);
......
......@@ -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();
......
......@@ -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();
......
......@@ -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 )
......
......@@ -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);
}
}
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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();
......
......@@ -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);
......
......@@ -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();
......
......@@ -3,4 +3,14 @@ aspect InfSchema {
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
......@@ -38,6 +38,7 @@ public static OpenAPIObject OpenAPIObject.parseOpenAPI(OpenApi3 api) throws IOEx
}
map.put(api, openapi);
return openapi;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment