Skip to content

Commit e5c51e9

Browse files
authored
Merge pull request #148 from SentryMan/branch
Fix such that Class Roles are added to Method Roles
2 parents 09e3c79 + ba4ae25 commit e5c51e9

File tree

11 files changed

+17
-16
lines changed

11 files changed

+17
-16
lines changed

http-api/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-http-parent</artifactId>
7-
<version>1.24-SNAPSHOT</version>
7+
<version>1.23-SNAPSHOT</version>
88
<relativePath>..</relativePath>
99
</parent>
1010

http-client-gson-adapter/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-http-parent</artifactId>
7-
<version>1.24-SNAPSHOT</version>
7+
<version>1.23-SNAPSHOT</version>
88
<relativePath>..</relativePath>
99
</parent>
1010

1111
<groupId>io.avaje</groupId>
1212
<artifactId>avaje-http-client-gson</artifactId>
13-
<version>1.24-SNAPSHOT</version>
13+
<version>1.23-SNAPSHOT</version>
1414

1515
<dependencies>
1616

@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>io.avaje</groupId>
2525
<artifactId>avaje-http-client</artifactId>
26-
<version>1.24-SNAPSHOT</version>
26+
<version>1.23-SNAPSHOT</version>
2727
<scope>provided</scope>
2828
</dependency>
2929

http-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<parent>
55
<groupId>io.avaje</groupId>
66
<artifactId>avaje-http-parent</artifactId>
7-
<version>1.24-SNAPSHOT</version>
7+
<version>1.23-SNAPSHOT</version>
88
<relativePath>..</relativePath>
99
</parent>
1010

1111
<groupId>io.avaje</groupId>
1212
<artifactId>avaje-http-client</artifactId>
13-
<version>1.24-SNAPSHOT</version>
13+
<version>1.23-SNAPSHOT</version>
1414

1515
<scm>
1616
<developerConnection>scm:git:git@github.com:avaje/avaje-http-client.git</developerConnection>

http-generator-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.avaje</groupId>
77
<artifactId>avaje-http-parent</artifactId>
8-
<version>1.24-SNAPSHOT</version>
8+
<version>1.23-SNAPSHOT</version>
99
<relativePath>..</relativePath>
1010
</parent>
1111

http-generator-core/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-parent</artifactId>
10-
<version>1.24-SNAPSHOT</version>
10+
<version>1.23-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

@@ -32,7 +32,7 @@
3232
<dependency>
3333
<groupId>io.avaje</groupId>
3434
<artifactId>avaje-http-api</artifactId>
35-
<version>1.24-SNAPSHOT</version>
35+
<version>1.23-SNAPSHOT</version>
3636
</dependency>
3737

3838
<dependency>

http-generator-core/src/main/java/io/avaje/http/generator/core/MethodReader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,9 @@ public void buildApiDocumentation(ProcessingContext ctx) {
250250
}
251251

252252
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;
255256
}
256257

257258
public boolean isWebMethod() {

http-generator-helidon/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-parent</artifactId>
10-
<version>1.24-SNAPSHOT</version>
10+
<version>1.23-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

http-generator-javalin/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-parent</artifactId>
10-
<version>1.24-SNAPSHOT</version>
10+
<version>1.23-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

http-generator-jex/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>io.avaje</groupId>
99
<artifactId>avaje-http-parent</artifactId>
10-
<version>1.24-SNAPSHOT</version>
10+
<version>1.23-SNAPSHOT</version>
1111
<relativePath>..</relativePath>
1212
</parent>
1313

http-generator-nima/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>avaje-http-parent</artifactId>
55
<groupId>io.avaje</groupId>
6-
<version>1.24-SNAPSHOT</version>
6+
<version>1.23-SNAPSHOT</version>
77
</parent>
88
<modelVersion>4.0.0</modelVersion>
99

0 commit comments

Comments
 (0)