Skip to content

Commit 3afb9d7

Browse files
committed
fix: collect streams using Collectors.toList
Java 8 does not have Stream::toList.
1 parent b769614 commit 3afb9d7

File tree

9 files changed

+19
-9
lines changed

9 files changed

+19
-9
lines changed

src/main/java/io/weaviate/client/v1/async/rbac/api/RoleAllGetter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.List;
66
import java.util.Optional;
77
import java.util.concurrent.Future;
8+
import java.util.stream.Collectors;
89

910
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
1011
import org.apache.hc.core5.concurrent.FutureCallback;
@@ -38,7 +39,7 @@ public Result<List<Role>> parse(HttpResponse response, String body, ContentType
3839
.orElse(new ArrayList<>())
3940
.stream()
4041
.map(w -> w.toRole())
41-
.toList();
42+
.collect(Collectors.toList());
4243
return new Result<>(resp.getStatusCode(), roles, resp.getErrors());
4344
}
4445
});

src/main/java/io/weaviate/client/v1/async/users/api/UserRolesGetter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import java.util.List;
66
import java.util.Optional;
77
import java.util.concurrent.Future;
8+
import java.util.stream.Collectors;
89

910
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
1011
import org.apache.hc.core5.concurrent.FutureCallback;
@@ -45,7 +46,7 @@ public Result<List<Role>> parse(HttpResponse response, String body, ContentType
4546
.orElse(new ArrayList<>())
4647
.stream()
4748
.map(w -> w.toRole())
48-
.toList();
49+
.collect(Collectors.toList());
4950
return new Result<>(resp.getStatusCode(), roles, resp.getErrors());
5051
}
5152
});

src/main/java/io/weaviate/client/v1/rbac/api/RoleAllGetter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Arrays;
55
import java.util.List;
66
import java.util.Optional;
7+
import java.util.stream.Collectors;
78

89
import io.weaviate.client.Config;
910
import io.weaviate.client.base.BaseClient;
@@ -27,7 +28,7 @@ public Result<List<Role>> run() {
2728
.orElse(new ArrayList<>())
2829
.stream()
2930
.map(w -> w.toRole())
30-
.toList();
31+
.collect(Collectors.toList());
3132
return new Result<>(resp.getStatusCode(), roles, resp.getErrors());
3233
}
3334
}

src/main/java/io/weaviate/client/v1/rbac/api/WeaviatePermission.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.weaviate.client.v1.rbac.api;
22

33
import java.util.List;
4+
import java.util.stream.Collectors;
45

56
import io.weaviate.client.v1.rbac.model.BackupsPermission;
67
import io.weaviate.client.v1.rbac.model.CollectionsPermission;
@@ -48,6 +49,6 @@ public <P extends Permission<P>> WeaviatePermission(String action, Permission<P>
4849
}
4950

5051
public static List<WeaviatePermission> mergePermissions(List<Permission<?>> permissions) {
51-
return permissions.stream().map(perm -> perm.toWeaviate()).toList();
52+
return permissions.stream().map(perm -> perm.toWeaviate()).collect(Collectors.toList());
5253
}
5354
}

src/main/java/io/weaviate/client/v1/rbac/api/WeaviateRole.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.weaviate.client.v1.rbac.api;
22

33
import java.util.List;
4+
import java.util.stream.Collectors;
45

56
import io.weaviate.client.v1.rbac.model.Permission;
67
import io.weaviate.client.v1.rbac.model.Role;
@@ -20,7 +21,7 @@ public WeaviateRole(String name, List<Permission<?>> permissions) {
2021
/** Create {@link Role} from the API response object. */
2122
public Role toRole() {
2223
List<Permission<?>> permissions = this.permissions.stream()
23-
.<Permission<?>>map(perm -> Permission.fromWeaviate(perm)).toList();
24+
.<Permission<?>>map(perm -> Permission.fromWeaviate(perm)).collect(Collectors.toList());
2425
return new Role(this.name, permissions);
2526
}
2627
}

src/main/java/io/weaviate/client/v1/rbac/model/Role.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.util.ArrayList;
44
import java.util.List;
5+
import java.util.stream.Collectors;
56

67
import lombok.AllArgsConstructor;
78
import lombok.EqualsAndHashCode;
@@ -19,6 +20,7 @@ public String toString() {
1920
"Role<name='%s', permissions=[%s]>",
2021
this.name, permissions.isEmpty()
2122
? "none"
22-
: String.join(", ", permissions.stream().map(Permission::getAction).toList()));
23+
: String.join(", ", permissions.stream().map(Permission::getAction)
24+
.collect(Collectors.toList())));
2325
}
2426
}

src/main/java/io/weaviate/client/v1/users/api/UserRolesGetter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.Arrays;
55
import java.util.List;
66
import java.util.Optional;
7+
import java.util.stream.Collectors;
78

89
import io.weaviate.client.Config;
910
import io.weaviate.client.base.BaseClient;
@@ -35,7 +36,7 @@ public Result<List<Role>> run() {
3536
.orElse(new ArrayList<>())
3637
.stream()
3738
.map(w -> w.toRole())
38-
.toList();
39+
.collect(Collectors.toList());
3940
return new Result<>(resp.getStatusCode(), roles, resp.getErrors());
4041
}
4142

src/main/java/io/weaviate/client/v1/users/api/WeaviateUser.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.weaviate.client.v1.users.api;
22

33
import java.util.List;
4+
import java.util.stream.Collectors;
45

56
import io.weaviate.client.v1.rbac.api.WeaviateRole;
67
import io.weaviate.client.v1.users.model.User;
@@ -11,6 +12,6 @@ public class WeaviateUser {
1112
List<WeaviateRole> roles;
1213

1314
public User toUser() {
14-
return new User(name, id, roles.stream().map(WeaviateRole::toRole).toList());
15+
return new User(name, id, roles.stream().map(WeaviateRole::toRole).collect(Collectors.toList()));
1516
}
1617
}

src/test/java/io/weaviate/integration/tests/users/ClientUsersTestSuite.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import java.util.List;
88
import java.util.function.Supplier;
9+
import java.util.stream.Collectors;
910

1011
import org.junit.ClassRule;
1112
import org.junit.Rule;
@@ -70,7 +71,7 @@ public void testGetUserRoles(Supplier<Users> userHandle) {
7071
Result<List<Role>> responseAdminUser = users.getUserRoles(adminUser);
7172
assertNull("get roles for user error", responseAdminUser.getError());
7273

73-
List<Role> currentRoles = myUser.getResult().getRoles().values().stream().toList();
74+
List<Role> currentRoles = myUser.getResult().getRoles().values().stream().collect(Collectors.toList());
7475
List<Role> adminRoles = responseAdminUser.getResult();
7576

7677
Assertions.assertArrayEquals(currentRoles.toArray(), adminRoles.toArray(),

0 commit comments

Comments
 (0)