diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java index 95ae4b5..789baa7 100644 --- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java +++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGeneratorFromDataFlowGraph.java @@ -3198,7 +3198,7 @@ for (VariableDeclaration var: updateAccessor.getParameters()) { args.add(var.getName()); } - updateAccessor.addStatement(langSpec.getMethodInvocation(resourceAccess, updateMethodName, args)); + updateAccessor.addStatement(langSpec.getMethodInvocation(resourceAccess, updateMethodName, args) + langSpec.getStatementDelimiter()); rootComponent.addMethod(updateAccessor); } diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java index 9ff7cfb..b744713 100644 --- a/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java +++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseyCodeGenerator.java @@ -168,9 +168,9 @@ cu.addImport(new ImportDeclaration("java.util.*")); if (resourceNode.getResourceHierarchy().getParent() == null) { // For a root node. - cu.addImport(new ImportDeclaration("javax.ws.rs.*")); - cu.addImport(new ImportDeclaration("javax.ws.rs.client.*")); - cu.addImport(new ImportDeclaration("javax.ws.rs.core.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.client.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.core.*")); cu.addImport(new ImportDeclaration("org.springframework.stereotype.Component")); cu.addImport(new ImportDeclaration("com.fasterxml.jackson.databind.ObjectMapper")); cu.addImport(new ImportDeclaration("com.fasterxml.jackson.core.JsonProcessingException")); @@ -1128,7 +1128,7 @@ if (field.getType().equals(typeClient)) { for (CompilationUnit cu: codes) { if (cu.types().contains(component)) { - cu.addImport(new ImportDeclaration("javax.ws.rs.client.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.client.*")); break; } } diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JerseySpecific.java b/AlgebraicDataflowArchitectureModel/src/generators/JerseySpecific.java index f954afb..a9f4c3c 100644 --- a/AlgebraicDataflowArchitectureModel/src/generators/JerseySpecific.java +++ b/AlgebraicDataflowArchitectureModel/src/generators/JerseySpecific.java @@ -65,9 +65,12 @@ @Override public void addPlatformSpecificImports(CompilationUnit cu) { - cu.addImport(new ImportDeclaration("javax.ws.rs.*")); - cu.addImport(new ImportDeclaration("javax.ws.rs.client.*")); - cu.addImport(new ImportDeclaration("javax.ws.rs.core.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.client.*")); + cu.addImport(new ImportDeclaration("jakarta.ws.rs.core.*")); +// cu.addImport(new ImportDeclaration("javax.ws.rs.*")); +// cu.addImport(new ImportDeclaration("javax.ws.rs.client.*")); +// cu.addImport(new ImportDeclaration("javax.ws.rs.core.*")); cu.addImport(new ImportDeclaration("org.springframework.stereotype.Component")); cu.addImport(new ImportDeclaration("com.fasterxml.jackson.databind.ObjectMapper")); cu.addImport(new ImportDeclaration("com.fasterxml.jackson.core.JsonProcessingException"));