Remove private getters

QubitPi · Apr 20, 2024 · b909d71 · b909d71
1 parent f7f508a
commit b909d71
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 109 deletions.
diff --git a/athena-core/src/main/java/io/github/qubitpi/athena/application/ResourceConfig.java b/athena-core/src/main/java/io/github/qubitpi/athena/application/ResourceConfig.java
@@ -25,7 +25,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.validation.constraints.NotNull;
 import jakarta.ws.rs.ApplicationPath;
 
 import jakarta.inject.Inject;
@@ -59,7 +58,7 @@ public class ResourceConfig extends org.glassfish.jersey.server.ResourceConfig {
      */
     @Inject
     public ResourceConfig() throws ClassNotFoundException, InstantiationException, IllegalAccessException {
-        final Class<? extends BinderFactory> binderClass = Class.forName(getBindingFactory())
+        final Class<? extends BinderFactory> binderClass = Class.forName(bindingFactory)
                 .asSubclass(BinderFactory.class);
         LOG.info("Application resource binder is '{}'", binderClass.getCanonicalName());
         final BinderFactory binderFactory = binderClass.newInstance();
@@ -72,9 +71,4 @@ public ResourceConfig() throws ClassNotFoundException, InstantiationException, I
         // Call post-registration hook to allow for additional registration
         binderFactory.afterRegistration(this);
     }
-
-    @NotNull
-    private String getBindingFactory() {
-        return bindingFactory;
-    }
 }
diff --git a/athena-core/src/main/java/io/github/qubitpi/athena/web/endpoints/FileServlet.java b/athena-core/src/main/java/io/github/qubitpi/athena/web/endpoints/FileServlet.java
@@ -90,8 +90,8 @@ public Response uploadFile(
             final @NotNull @FormDataParam("file") FormDataContentDisposition fileMetaData
     ) {
         final File file = new File(MetaData.of(fileMetaData), fileContent);
-        final String fileId = getFileStore().upload(file);
-        getMetaStore().saveMetaData(fileId, file.getMetaData());
+        final String fileId = fileStore.upload(file);
+        metaStore.saveMetaData(fileId, file.getMetaData());
         return Response
                 .status(Response.Status.CREATED)
                 .entity(Collections.singletonMap(FILE_ID, fileId))
@@ -115,29 +115,19 @@ public Response uploadFile(
     public Response downloadFile(@QueryParam(FILE_ID) final String fileId) {
         return Response
                 .ok(
-                        getFileStore().download(Objects.requireNonNull(fileId)),
+                        fileStore.download(Objects.requireNonNull(fileId)),
                         MediaType.APPLICATION_OCTET_STREAM
                 )
                 .header(
                         "content-disposition",
                         String.format(
                                 "attachment; filename = %s",
-                                ((Map<?, ?>) ((Map<?, ?>) getMetaStore()
+                                ((Map<?, ?>) ((Map<?, ?>) metaStore
                                         .getMetaData(fileId, Collections.singletonList(MetaData.FILE_NAME))
                                         .toSpecification().get("data")).get("metaData"))
                                         .get(MetaData.FILE_NAME).toString()
                         )
                 )
                 .build();
     }
-
-    @NotNull
-    private FileStore getFileStore() {
-        return fileStore;
-    }
-
-    @NotNull
-    private MetaStore getMetaStore() {
-        return metaStore;
-    }
 }
diff --git a/athena-core/src/main/java/io/github/qubitpi/athena/web/endpoints/MetaServlet.java b/athena-core/src/main/java/io/github/qubitpi/athena/web/endpoints/MetaServlet.java
@@ -92,7 +92,7 @@ public MetaServlet(final @NotNull MetaStore metaStore, final @NotNull JsonDocume
     public Response get(final @NotNull @QueryParam("query") String query) {
         return Response
                 .status(Response.Status.OK)
-                .entity(getMetaStore().executeNative(Objects.requireNonNull(query)))
+                .entity(metaStore.executeNative(Objects.requireNonNull(query)))
                 .build();
     }
 
@@ -122,7 +122,7 @@ public Response get(final @NotNull @QueryParam("query") String query) {
     public Response post(final @NotNull String graphQLDocument) {
         Objects.requireNonNull(graphQLDocument);
 
-        final List<String> requestedMetadataFields = getJsonDocumentParser().getFields(graphQLDocument);
+        final List<String> requestedMetadataFields = jsonDocumentParser.getFields(graphQLDocument);
         if (requestedMetadataFields.isEmpty()) {
             LOG.error(ErrorMessageFormat.INVALID_GRAPHQL_REQUEST.logFormat("No metadata field found", graphQLDocument));
             throw new IllegalArgumentException(
@@ -133,21 +133,11 @@ public Response post(final @NotNull String graphQLDocument) {
         return Response
                 .status(Response.Status.OK)
                 .entity(
-                        getMetaStore().getMetaData(
-                                getJsonDocumentParser().getFileId(graphQLDocument),
+                        metaStore.getMetaData(
+                                jsonDocumentParser.getFileId(graphQLDocument),
                                 requestedMetadataFields
                         )
                 )
                 .build();
     }
-
-    @NotNull
-    private MetaStore getMetaStore() {
-        return metaStore;
-    }
-
-    @NotNull
-    private JsonDocumentParser getJsonDocumentParser() {
-        return jsonDocumentParser;
-    }
 }
diff --git a/athena-core/src/test/java/io/github/qubitpi/athena/application/TestMutationDataFetcher.java b/athena-core/src/test/java/io/github/qubitpi/athena/application/TestMutationDataFetcher.java
@@ -21,7 +21,6 @@
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import jakarta.validation.constraints.NotNull;
 import net.jcip.annotations.GuardedBy;
 import net.jcip.annotations.NotThreadSafe;
 
@@ -68,13 +67,8 @@ public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) {
                 ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
         );
 
-        getMetaDataByFileId().put(fileId, newMetaData);
+        metaDataByFileId.put(fileId, newMetaData);
 
         return newMetaData;
     }
-
-    @NotNull
-    private Map<String, MetaData> getMetaDataByFileId() {
-        return metaDataByFileId;
-    }
 }
diff --git a/athena-core/src/test/java/io/github/qubitpi/athena/application/TestQueryDataFetcher.java b/athena-core/src/test/java/io/github/qubitpi/athena/application/TestQueryDataFetcher.java
@@ -51,11 +51,6 @@ public TestQueryDataFetcher(final @NotNull Map<String, MetaData> metaDataByFileI
     @Override
     public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) {
         final String fileId = dataFetchingEnvironment.getArgument(FILE_ID);
-        return getMetaDataByFileId().get(fileId);
-    }
-
-    @NotNull
-    private Map<String, MetaData> getMetaDataByFileId() {
-        return metaDataByFileId;
+        return metaDataByFileId.get(fileId);
     }
 }
diff --git a/athena-core/src/test/java/io/github/qubitpi/athena/filestore/TestFileStore.java b/athena-core/src/test/java/io/github/qubitpi/athena/filestore/TestFileStore.java
@@ -81,9 +81,9 @@ public TestFileStore(
 
     @Override
     public String upload(final File file) {
-        final String fileId = getFileIdGenerator().apply(file);
-        getFileByFileId().put(
-                getFileIdGenerator().apply(file),
+        final String fileId = fileIdGenerator.apply(file);
+        fileByFileId.put(
+                fileIdGenerator.apply(file),
                 new BufferedReader(new InputStreamReader(file.getFileContent()))
                         .lines().collect(Collectors.joining("\n"))
         );
@@ -92,16 +92,6 @@ public String upload(final File file) {
 
     @Override
     public InputStream download(final String fileId) {
-        return new ByteArrayInputStream(getFileByFileId().get(fileId).getBytes());
-    }
-
-    @NotNull
-    private Map<String, String> getFileByFileId() {
-        return fileByFileId;
-    }
-
-    @NotNull
-    private FileIdGenerator getFileIdGenerator() {
-        return fileIdGenerator;
+        return new ByteArrayInputStream(fileByFileId.get(fileId).getBytes());
     }
 }
diff --git a/.../main/java/io/github/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java b/.../main/java/io/github/qubitpi/athena/example/books/application/SQLMutationDataFetcher.java
@@ -19,7 +19,6 @@
 
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-import jakarta.validation.constraints.NotNull;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -61,7 +60,7 @@ public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) throw
         final String fileType = dataFetchingEnvironment.getArgument(MetaData.FILE_TYPE);
 
         try (
-                Connection connection = getDataSource().getConnection();
+                Connection connection = dataSource.getConnection();
                 PreparedStatement statement = connection.prepareStatement(META_DATA_PERSIST_QUERY_TEMPLATE)
         ) {
             statement.setString(1, fileId);
@@ -77,9 +76,4 @@ public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) throw
                 ).collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))
         );
     }
-
-    @NotNull
-    private DataSource getDataSource() {
-        return dataSource;
-    }
 }
diff --git a/...src/main/java/io/github/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java b/...src/main/java/io/github/qubitpi/athena/example/books/application/SQLQueryDataFetcher.java
@@ -70,7 +70,7 @@ public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) throw
         final String fileId = dataFetchingEnvironment.getArgument(FILE_ID);
         final ResultSet resultSet;
         try (
-                Connection connection = getDataSource().getConnection();
+                Connection connection = dataSource.getConnection();
                 PreparedStatement statement = connection.prepareStatement(META_DATA_FETCH_QUERY_TEMPLATE)
         ) {
             statement.setString(1, fileId);
@@ -100,9 +100,4 @@ public MetaData get(final DataFetchingEnvironment dataFetchingEnvironment) throw
             return metaData;
         }
     }
-
-    @NotNull
-    private DataSource getDataSource() {
-        return dataSource;
-    }
 }
diff --git a/...ilestore-swift/src/main/java/io/github/qubitpi/athena/filestore/swift/SwiftFileStore.java b/...ilestore-swift/src/main/java/io/github/qubitpi/athena/filestore/swift/SwiftFileStore.java
@@ -68,9 +68,9 @@ public SwiftFileStore(final @NotNull Account account, final @NotNull FileIdGener
     @Override
     public String upload(final File file) {
         Objects.requireNonNull(file);
-        final String fileId = getFileIdGenerator().apply(file);
+        final String fileId = fileIdGenerator.apply(file);
 
-        getAccount()
+        account
                 .getContainer(DEFAULT_CONTAINER)
                 .getObject(fileId)
                 .uploadObject(file.getFileContent());
@@ -80,19 +80,9 @@ public String upload(final File file) {
 
     @Override
     public InputStream download(final String fileId) {
-        return getAccount()
+        return account
                 .getContainer(DEFAULT_CONTAINER)
                 .getObject(Objects.requireNonNull(fileId))
                 .downloadObjectAsInputStream();
     }
-
-    @NotNull
-    private Account getAccount() {
-        return account;
-    }
-
-    @NotNull
-    private FileIdGenerator getFileIdGenerator() {
-        return fileIdGenerator;
-    }
 }
diff --git a/...re-graphql/src/main/java/io/github/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java b/...re-graphql/src/main/java/io/github/qubitpi/athena/metastore/graphql/GraphQLMetaStore.java
@@ -92,7 +92,7 @@ private GraphQLMetaStore(@NotNull final GraphQL graphQL, @NotNull final GraphQLQ
 
     @Override
     public ExecutionResult executeNative(final String query) {
-        return getGraphQL().execute(Objects.requireNonNull(query));
+        return graphQL.execute(Objects.requireNonNull(query));
     }
 
     @Override
@@ -104,30 +104,20 @@ public ExecutionResult getMetaData(final String fileId, final List<String> metad
             throw new IllegalArgumentException(EMPTY_LIST.format());
         }
 
-        return getGraphQL().execute(
+        return graphQL.execute(
                 ExecutionInput.newExecutionInput()
-                        .query(getGraphQLQueryProvider().query(fileId, metadataFields))
+                        .query(graphQLQueryProvider.query(fileId, metadataFields))
                         .build()
         );
     }
 
     @Override
     public void saveMetaData(final String fileId, final MetaData metaData) {
-        getGraphQL().execute(
-                getGraphQLQueryProvider().mutation(
+        graphQL.execute(
+                graphQLQueryProvider.mutation(
                         Objects.requireNonNull(fileId),
                         Objects.requireNonNull(metaData)
                 )
         );
     }
-
-    @NotNull
-    private GraphQL getGraphQL() {
-        return graphQL;
-    }
-
-    @NotNull
-    private GraphQLQueryProvider getGraphQLQueryProvider() {
-        return graphQLQueryProvider;
-    }
 }
diff --git a/docs/docs/filestores/index.md b/docs/docs/filestores/index.md
@@ -103,7 +103,7 @@ public class S3FileStore implements FileStore {
     public String upload(final File file) {
         final String fileId = fileIdGenerator.apply(file);
 
-        getS3client().putObject(
+        s3client.putObject(
                 file.getMetaData().getFileType().name(),
                 fileId,
                 file.getFileContent(),
@@ -117,11 +117,6 @@ public class S3FileStore implements FileStore {
     public InputStream download(final String fileId) {
        return getS3client().getObject(...);
     }
-
-    @NotNull
-    private AmazonS3 getS3client() {
-        return s3client;
-    }
 }
 ```