Merge remote-tracking branch 'upstream/master' into innerConflict

SentryMan · SentryMan · commit c31c5e61c096 · 2023-01-31T16:27:55.000-05:00
diff --git a/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java b/http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java
@@ -250,8 +250,9 @@ public void buildApiDocumentation(ProcessingContext ctx) {
   }
 
   public List<String> roles() {
-    methodRoles.addAll(bean.roles());
-    return methodRoles;
+    var roles = new ArrayList<>(methodRoles);
+    roles.addAll(bean.roles());
+    return roles;
   }
 
   public boolean isWebMethod() {

Original file line number	Diff line number	Diff line change
`@@ -250,8 +250,9 @@ public void buildApiDocumentation(ProcessingContext ctx) {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`public List<String> roles() {`
`253`		`- methodRoles.addAll(bean.roles());`
`254`		`- return methodRoles;`
	`253`	`+ var roles = new ArrayList<>(methodRoles);`
	`254`	`+ roles.addAll(bean.roles());`
	`255`	`+ return roles;`
`255`	`256`	`}`
`256`	`257`
`257`	`258`	`public boolean isWebMethod() {`