Skip to content

Improve protobuf java deps handling #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tstirrat15 merged 5 commits into from
May 1, 2025
Merged

Improve protobuf java deps handling #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5f8481b
Exclude protobuf-java as transitive dependency of grpc-protobuf, sinc…
julianleonard123 Apr 30, 2025
af6465c
Change the protobuf-java dependency scope to be api, so that it is in…
julianleonard123 Apr 30, 2025
27e83cf
Update the example code, which hasn't been compilable since the chang…
julianleonard123 May 1, 2025
1036f96
Update versions of io.grpc dependencies to match what's in gradle con…
julianleonard123 May 1, 2025
0601d3a
Update versions to latest picked up by dependabot.
julianleonard123 May 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ Most commonly, if you are using [Maven] you can add the following to your pom.xm
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
<version>1.66.0</version>
<artifactId>grpc-api</artifactId>
<version>1.72.0</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
<version>1.66.0</version>
<version>1.72.0</version>
</dependency>
</dependencies>
```
Expand All @@ -71,8 +71,8 @@ If you are using [Gradle] then add the following to your `build.gradle` file:
```groovy
dependencies {
implementation "com.authzed.api:authzed:v1.0.0"
implementation 'io.grpc:grpc-protobuf:1.66.0'
implementation 'io.grpc:grpc-stub:1.66.0'
implementation 'io.grpc:grpc-api:1.72.0'
implementation 'io.grpc:grpc-stub:1.72.0'
}
```

Expand Down
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ tasks.sourcesJar {
// All it does is complain about generated code.
javadoc { options.addStringOption('Xdoclint:none', '-quiet') }

def grpcVersion = "1.71.0"
def grpcVersion = "1.72.0"
def protocVersion = "4.30.2"
def authzedProtoCommit = "v1.41.0"
def bufDir = "${buildDir}/buf"
Expand All @@ -96,8 +96,10 @@ sourceSets { main {
}}

dependencies {
implementation "io.grpc:grpc-protobuf:${grpcVersion}"
implementation "com.google.protobuf:protobuf-java:${protocVersion}"
implementation("io.grpc:grpc-protobuf:${grpcVersion}") {
exclude group: 'com.google.protobuf', module: 'protobuf-java'
}
api "com.google.protobuf:protobuf-java:${protocVersion}"
implementation "io.grpc:grpc-stub:${grpcVersion}"
runtimeOnly "io.grpc:grpc-netty-shaded:${grpcVersion}"
compileOnly "org.apache.tomcat:annotations-api:6.0.53"
Expand Down
43 changes: 22 additions & 21 deletions examples/v1/App.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,24 @@
import java.util.logging.Level;
import java.util.logging.Logger;

import com.authzed.api.v1.Core;
import com.authzed.api.v1.Core.ObjectReference;
import com.authzed.api.v1.Core.Relationship;
import com.authzed.api.v1.Core.SubjectReference;
import com.authzed.api.v1.Core.ZedToken;
import com.authzed.api.v1.PermissionService;
import com.authzed.api.v1.PermissionService.CheckPermissionRequest;
import com.authzed.api.v1.PermissionService.Consistency;
import com.authzed.api.v1.PermissionService.CheckPermissionResponse.Permissionship;
import com.authzed.api.v1.CheckPermissionRequest;
import com.authzed.api.v1.CheckPermissionResponse;
import com.authzed.api.v1.CheckPermissionResponse.Permissionship;
import com.authzed.api.v1.Consistency;
import com.authzed.api.v1.ObjectReference;
import com.authzed.api.v1.PermissionsServiceGrpc;
import com.authzed.api.v1.ReadSchemaRequest;
import com.authzed.api.v1.ReadSchemaResponse;
import com.authzed.api.v1.Relationship;
import com.authzed.api.v1.RelationshipUpdate;
import com.authzed.api.v1.SchemaServiceGrpc;
import com.authzed.api.v1.SchemaServiceOuterClass.ReadSchemaRequest;
import com.authzed.api.v1.SchemaServiceOuterClass.ReadSchemaResponse;
import com.authzed.api.v1.SchemaServiceOuterClass.WriteSchemaRequest;
import com.authzed.api.v1.SchemaServiceOuterClass.WriteSchemaResponse;
import com.authzed.api.v1.SubjectReference;
import com.authzed.api.v1.WriteRelationshipsRequest;
import com.authzed.api.v1.WriteRelationshipsResponse;
import com.authzed.api.v1.WriteSchemaRequest;
import com.authzed.api.v1.WriteSchemaResponse;
import com.authzed.api.v1.ZedToken;
import com.authzed.grpcutil.BearerToken;

import io.grpc.Channel;
import io.grpc.ManagedChannel;
import io.grpc.ManagedChannelBuilder;
Expand Down Expand Up @@ -124,10 +125,10 @@ public String readSchema() {
public String writeRelationship() {
logger.info("Write relationship...");

PermissionService.WriteRelationshipsRequest request = PermissionService.WriteRelationshipsRequest.newBuilder()
WriteRelationshipsRequest request = WriteRelationshipsRequest.newBuilder()
.addUpdates(
com.authzed.api.v1.Core.RelationshipUpdate.newBuilder()
.setOperation(Core.RelationshipUpdate.Operation.OPERATION_CREATE)
RelationshipUpdate.newBuilder()
.setOperation(RelationshipUpdate.Operation.OPERATION_CREATE)
.setRelationship(
Relationship.newBuilder()
.setResource(
Expand All @@ -148,7 +149,7 @@ public String writeRelationship() {
.build())
.build();

PermissionService.WriteRelationshipsResponse response;
WriteRelationshipsResponse response;
try {
response = permissionsService.writeRelationships(request);
} catch (Exception e) {
Expand All @@ -162,7 +163,7 @@ public String writeRelationship() {
public Permissionship check(ZedToken zedToken) {
logger.info("Checking...");

PermissionService.CheckPermissionRequest request = CheckPermissionRequest.newBuilder()
CheckPermissionRequest request = CheckPermissionRequest.newBuilder()
.setConsistency(
Consistency.newBuilder()
.setAtLeastAsFresh(zedToken)
Expand All @@ -183,12 +184,12 @@ public Permissionship check(ZedToken zedToken) {
.setPermission("can_comment")
.build();

PermissionService.CheckPermissionResponse response;
CheckPermissionResponse response;
try {
response = permissionsService.checkPermission(request);
} catch (Exception e) {
logger.log(Level.WARNING, "RPC failed: {0}", e.getMessage());
return "";
return null;
}
logger.info("Response: " + response.toString());
return response.getPermissionship();
Expand Down
Loading