From bdb217e7b44e899f6e2465310fc4f37d46f835b8 Mon Sep 17 00:00:00 2001 From: Thomas Richner Date: Sun, 16 Jun 2024 16:43:47 +0200 Subject: [PATCH] ARC-1807: Cleanup --- .../api/internal/CheckPermissionImpl.java | 16 -------- .../api/internal/RelationshipFilterImpl.java | 8 ---- .../api/internal/UpdateRelationshipsImpl.java | 8 ---- .../spicegen/api/CheckPermissionTest.java | 4 +- .../oviva/spicegen/api/SubjectRefTest.java | 2 +- .../spicegen/api/UpdateRelationshipTest.java | 8 ++-- .../spicegen/api/UpdateRelationshipsTest.java | 4 +- example/pom.xml | 5 +++ .../oviva/spicegen/example/ExampleTest.java | 7 ++-- .../oviva/spicegen/maven/SpicegenMojo.java | 16 -------- .../spicegen/parser/AstPreProcessor.java | 3 +- .../internal/GrpcExceptionMapperTest.java | 39 +++++++++---------- .../spicedbbinding/internal/SpiceDbUtils.java | 4 +- .../UpdateRelationshipMapperTest.java | 22 +++++------ 14 files changed, 50 insertions(+), 96 deletions(-) diff --git a/api/src/main/java/com/oviva/spicegen/api/internal/CheckPermissionImpl.java b/api/src/main/java/com/oviva/spicegen/api/internal/CheckPermissionImpl.java index e5d92d4..fa6e3ab 100644 --- a/api/src/main/java/com/oviva/spicegen/api/internal/CheckPermissionImpl.java +++ b/api/src/main/java/com/oviva/spicegen/api/internal/CheckPermissionImpl.java @@ -17,22 +17,6 @@ public static Builder newBuilder() { return new Builder(); } - public ObjectRef resource() { - return resource; - } - - public String permission() { - return permission; - } - - public SubjectRef subject() { - return subject; - } - - public Consistency consistency() { - return consistency; - } - public static final class Builder implements CheckPermission.Builder { private ObjectRef resource; private String permission; diff --git a/api/src/main/java/com/oviva/spicegen/api/internal/RelationshipFilterImpl.java b/api/src/main/java/com/oviva/spicegen/api/internal/RelationshipFilterImpl.java index 9bc5323..a5fc7b0 100644 --- a/api/src/main/java/com/oviva/spicegen/api/internal/RelationshipFilterImpl.java +++ b/api/src/main/java/com/oviva/spicegen/api/internal/RelationshipFilterImpl.java @@ -18,10 +18,6 @@ private RelationshipFilterImpl(Builder builder) { Optional.ofNullable(builder.subjectFilter)); } - public String resourceKind() { - return resourceKind; - } - public record SubjectFilterImpl( String subjectKind, Optional subjectId, Optional relation) implements SubjectFilter { @@ -33,10 +29,6 @@ private SubjectFilterImpl(Builder builder) { Optional.ofNullable(builder.relation)); } - public String subjectKind() { - return subjectKind; - } - public static final class Builder implements SubjectFilter.Builder { private String subjectKind; private String subjectId; diff --git a/api/src/main/java/com/oviva/spicegen/api/internal/UpdateRelationshipsImpl.java b/api/src/main/java/com/oviva/spicegen/api/internal/UpdateRelationshipsImpl.java index 0856a99..5f4e9e0 100644 --- a/api/src/main/java/com/oviva/spicegen/api/internal/UpdateRelationshipsImpl.java +++ b/api/src/main/java/com/oviva/spicegen/api/internal/UpdateRelationshipsImpl.java @@ -14,14 +14,6 @@ public static Builder newBuilder() { return new Builder(); } - public List updates() { - return updates; - } - - public List preconditions() { - return preconditions; - } - public static final class Builder implements UpdateRelationships.Builder { private List preconditions = new ArrayList<>(); private List updates = new ArrayList<>(); diff --git a/api/src/test/java/com/oviva/spicegen/api/CheckPermissionTest.java b/api/src/test/java/com/oviva/spicegen/api/CheckPermissionTest.java index 3729588..b8fc796 100644 --- a/api/src/test/java/com/oviva/spicegen/api/CheckPermissionTest.java +++ b/api/src/test/java/com/oviva/spicegen/api/CheckPermissionTest.java @@ -5,10 +5,10 @@ import org.junit.jupiter.api.Test; -public class CheckPermissionTest { +class CheckPermissionTest { @Test - public void test_build_success() { + void test_build_success() { var namespace = "tenant"; var id = "9392"; diff --git a/api/src/test/java/com/oviva/spicegen/api/SubjectRefTest.java b/api/src/test/java/com/oviva/spicegen/api/SubjectRefTest.java index bdc37ba..5294905 100644 --- a/api/src/test/java/com/oviva/spicegen/api/SubjectRefTest.java +++ b/api/src/test/java/com/oviva/spicegen/api/SubjectRefTest.java @@ -14,7 +14,7 @@ void ofUser() { var user = SubjectRef.ofObject(ObjectRef.of("user", uuid.toString())); assertEquals(user.id(), uuid.toString()); - assertEquals(user.kind(), "user"); + assertEquals("user", user.kind()); } @Test diff --git a/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipTest.java b/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipTest.java index 8c9d5b5..12c400b 100644 --- a/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipTest.java +++ b/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipTest.java @@ -24,8 +24,8 @@ void test_ofUpdate() { var updateRelationship = UpdateRelationship.ofUpdate(resource, ADMINISTRATOR, subject); - assertEquals(updateRelationship.operation(), UpdateRelationship.Operation.UPDATE); - assertEquals(updateRelationship.relation(), ADMINISTRATOR); + assertEquals(UpdateRelationship.Operation.UPDATE, updateRelationship.operation()); + assertEquals(ADMINISTRATOR, updateRelationship.relation()); assertEquals(updateRelationship.resource(), resource); assertEquals(updateRelationship.subject(), SubjectRef.ofObject(subject)); } @@ -38,8 +38,8 @@ void test_ofDelete() { var updateRelationship = UpdateRelationship.ofDelete(resource, ADMINISTRATOR, subject); - assertEquals(updateRelationship.operation(), UpdateRelationship.Operation.DELETE); - assertEquals(updateRelationship.relation(), ADMINISTRATOR); + assertEquals(UpdateRelationship.Operation.DELETE, updateRelationship.operation()); + assertEquals(ADMINISTRATOR, updateRelationship.relation()); assertEquals(updateRelationship.resource(), resource); assertEquals(updateRelationship.subject(), SubjectRef.ofObject(subject)); } diff --git a/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipsTest.java b/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipsTest.java index 7346046..157aed1 100644 --- a/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipsTest.java +++ b/api/src/test/java/com/oviva/spicegen/api/UpdateRelationshipsTest.java @@ -67,9 +67,9 @@ public void test_updateRelationshipsBuilder_withAddOperations() { .update(updateRelationship) .build(); - assertEquals(updateRelationships.updates().size(), 1); + assertEquals(1, updateRelationships.updates().size()); assertEquals(updateRelationships.updates().get(0), updateRelationship); - assertEquals(updateRelationships.preconditions().size(), 1); + assertEquals(1, updateRelationships.preconditions().size()); assertEquals(updateRelationships.preconditions().get(0), precondition); } diff --git a/example/pom.xml b/example/pom.xml index 9b283f9..069792f 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -37,6 +37,11 @@ test + + com.authzed.api + authzed + test + org.testcontainers testcontainers diff --git a/example/src/test/java/com/oviva/spicegen/example/ExampleTest.java b/example/src/test/java/com/oviva/spicegen/example/ExampleTest.java index c4b6a7a..0705be3 100644 --- a/example/src/test/java/com/oviva/spicegen/example/ExampleTest.java +++ b/example/src/test/java/com/oviva/spicegen/example/ExampleTest.java @@ -4,7 +4,7 @@ import com.authzed.api.v1.PermissionsServiceGrpc; import com.authzed.api.v1.SchemaServiceGrpc; -import com.authzed.api.v1.SchemaServiceOuterClass; +import com.authzed.api.v1.WriteSchemaRequest; import com.authzed.grpcutil.BearerToken; import com.oviva.spicegen.api.*; import com.oviva.spicegen.permissions.refs.DocumentRef; @@ -26,7 +26,7 @@ import org.testcontainers.utility.DockerImageName; @Testcontainers -public class ExampleTest { +class ExampleTest { private static final int GRPC_PORT = 50051; private static final String TOKEN = "t0ken"; @@ -75,8 +75,7 @@ private void updateSchema() { var schemaService = SchemaServiceGrpc.newBlockingStub(channel).withCallCredentials(new BearerToken(TOKEN)); - schemaService.writeSchema( - SchemaServiceOuterClass.WriteSchemaRequest.newBuilder().setSchema(loadSchema()).build()); + schemaService.writeSchema(WriteSchemaRequest.newBuilder().setSchema(loadSchema()).build()); } @Test diff --git a/generator-maven-plugin/src/main/java/com/oviva/spicegen/maven/SpicegenMojo.java b/generator-maven-plugin/src/main/java/com/oviva/spicegen/maven/SpicegenMojo.java index f572718..4cd9543 100644 --- a/generator-maven-plugin/src/main/java/com/oviva/spicegen/maven/SpicegenMojo.java +++ b/generator-maven-plugin/src/main/java/com/oviva/spicegen/maven/SpicegenMojo.java @@ -1,21 +1,5 @@ package com.oviva.spicegen.maven; -/* - * Copyright 2001-2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - import com.oviva.spicegen.generator.Options; import com.oviva.spicegen.generator.internal.SpiceDbClientGeneratorImpl; import com.oviva.spicegen.parser.SpiceDbSchemaParser; diff --git a/model/src/main/java/com/oviva/spicegen/parser/AstPreProcessor.java b/model/src/main/java/com/oviva/spicegen/parser/AstPreProcessor.java index d94256e..30a45eb 100644 --- a/model/src/main/java/com/oviva/spicegen/parser/AstPreProcessor.java +++ b/model/src/main/java/com/oviva/spicegen/parser/AstPreProcessor.java @@ -82,8 +82,7 @@ private void loadParserBinary(Path parserDestination) { private String determineTarget() { - var target = "%s_%s".formatted(determineOs(), determineArch()); - return target; + return "%s_%s".formatted(determineOs(), determineArch()); } private String determineArch() { diff --git a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/GrpcExceptionMapperTest.java b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/GrpcExceptionMapperTest.java index e0c8cc0..73a6d18 100644 --- a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/GrpcExceptionMapperTest.java +++ b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/GrpcExceptionMapperTest.java @@ -1,63 +1,62 @@ package com.oviva.spicegen.spicedbbinding.internal; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; import com.oviva.spicegen.api.exceptions.*; import io.grpc.Status; import io.grpc.StatusRuntimeException; import org.junit.jupiter.api.Test; -public class GrpcExceptionMapperTest { +class GrpcExceptionMapperTest { private final GrpcExceptionMapper grpcExceptionMapper = new GrpcExceptionMapper(); @Test - public void test_map_permissionDenied() { + void test_map_permissionDenied() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.PERMISSION_DENIED)); - assertTrue(exception instanceof AuthorizationException); - assertEquals(exception.getMessage(), "permission denied"); + assertInstanceOf(AuthorizationException.class, exception); + assertEquals("permission denied", exception.getMessage()); } @Test - public void test_map_unauthenticated() { + void test_map_unauthenticated() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.UNAUTHENTICATED)); - assertTrue(exception instanceof AuthenticationException); - assertEquals(exception.getMessage(), "unauthenticated"); + assertInstanceOf(AuthenticationException.class, exception); + assertEquals("unauthenticated", exception.getMessage()); } @Test - public void test_map_alreadyExists() { + void test_map_alreadyExists() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.ALREADY_EXISTS)); - assertTrue(exception instanceof ConflictException); - assertEquals(exception.getMessage(), "already exists"); + assertInstanceOf(ConflictException.class, exception); + assertEquals("already exists", exception.getMessage()); } @Test - public void test_map_invalidArgument() { + void test_map_invalidArgument() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.INVALID_ARGUMENT)); - assertTrue(exception instanceof ValidationException); - assertEquals(exception.getMessage(), "invalid argument"); + assertInstanceOf(ValidationException.class, exception); + assertEquals("invalid argument", exception.getMessage()); } @Test - public void test_map_failedPrecondition() { + void test_map_failedPrecondition() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.FAILED_PRECONDITION)); - assertTrue(exception instanceof ValidationException); - assertEquals(exception.getMessage(), "failed precondition"); + assertInstanceOf(ValidationException.class, exception); + assertEquals("failed precondition", exception.getMessage()); } @Test - public void test_map_unexpectedValue() { + void test_map_unexpectedValue() { var exception = grpcExceptionMapper.map(new StatusRuntimeException(Status.CANCELLED)); - assertTrue(exception instanceof ClientException); + assertInstanceOf(ClientException.class, exception); assertTrue(exception.getMessage().startsWith("unexpected status:")); } } diff --git a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/SpiceDbUtils.java b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/SpiceDbUtils.java index b4573d3..f71e3ea 100644 --- a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/SpiceDbUtils.java +++ b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/SpiceDbUtils.java @@ -31,7 +31,7 @@ public static SubjectReference toRef(SubjectRef ref) { public static WriteRelationshipsRequest updateRelationshipRequest( ObjectRef resource, String relation, ObjectRef subject) { - logger.info("update: " + resource.toString() + "#" + relation + "@" + subject); + logger.info("update: {}#{}@{}", resource.toString(), relation, subject); return writeRelationshipRequest( resource, relation, subject, RelationshipUpdate.Operation.OPERATION_TOUCH); } @@ -39,7 +39,7 @@ public static WriteRelationshipsRequest updateRelationshipRequest( public static WriteRelationshipsRequest deleteRelationshipRequest( ObjectRef resource, String relation, ObjectRef subject) { - logger.info("delete: " + resource.toString() + "#" + relation + "@" + subject); + logger.info("delete: {}#{}@{}", resource.toString(), relation, subject); return writeRelationshipRequest( resource, relation, subject, RelationshipUpdate.Operation.OPERATION_DELETE); } diff --git a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/UpdateRelationshipMapperTest.java b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/UpdateRelationshipMapperTest.java index b4bed12..b28e60c 100644 --- a/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/UpdateRelationshipMapperTest.java +++ b/spicedb-binding/src/test/java/com/oviva/spicegen/spicedbbinding/internal/UpdateRelationshipMapperTest.java @@ -8,7 +8,7 @@ import com.oviva.spicegen.api.UpdateRelationship; import org.junit.jupiter.api.Test; -public class UpdateRelationshipMapperTest { +class UpdateRelationshipMapperTest { private static final String TENANT = "tenant"; private static final String USER = "user"; @@ -18,7 +18,7 @@ public class UpdateRelationshipMapperTest { private final UpdateRelationshipMapper mapper = new UpdateRelationshipMapper(); @Test - public void test_mapper_withUpdateOperation() { + void test_mapper_withUpdateOperation() { var resource = ObjectRef.of(TENANT, ID); var subject = ObjectRef.of(USER, ID); @@ -26,15 +26,15 @@ public void test_mapper_withUpdateOperation() { var updateRelationship = UpdateRelationship.ofUpdate(resource, ADMINISTRATOR, subject); var map = mapper.map(updateRelationship); - assertEquals(map.getOperation(), RelationshipUpdate.Operation.OPERATION_TOUCH); + assertEquals(RelationshipUpdate.Operation.OPERATION_TOUCH, map.getOperation()); assertNotNull(map.getRelationship()); - assertEquals(map.getRelationship().getRelation(), ADMINISTRATOR); - assertEquals(map.getRelationship().getResource().getObjectId(), ID); - assertEquals(map.getRelationship().getResource().getObjectType(), TENANT); + assertEquals(ADMINISTRATOR, map.getRelationship().getRelation()); + assertEquals(ID, map.getRelationship().getResource().getObjectId()); + assertEquals(TENANT, map.getRelationship().getResource().getObjectType()); } @Test - public void test_mapper_withDeleteOperation() { + void test_mapper_withDeleteOperation() { var resource = ObjectRef.of(TENANT, ID); var subject = ObjectRef.of(USER, ID); @@ -42,10 +42,10 @@ public void test_mapper_withDeleteOperation() { var updateRelationship = UpdateRelationship.ofDelete(resource, ADMINISTRATOR, subject); var map = mapper.map(updateRelationship); - assertEquals(map.getOperation(), RelationshipUpdate.Operation.OPERATION_DELETE); + assertEquals(RelationshipUpdate.Operation.OPERATION_DELETE, map.getOperation()); assertNotNull(map.getRelationship()); - assertEquals(map.getRelationship().getRelation(), ADMINISTRATOR); - assertEquals(map.getRelationship().getResource().getObjectId(), ID); - assertEquals(map.getRelationship().getResource().getObjectType(), TENANT); + assertEquals(ADMINISTRATOR, map.getRelationship().getRelation()); + assertEquals(ID, map.getRelationship().getResource().getObjectId()); + assertEquals(TENANT, map.getRelationship().getResource().getObjectType()); } }