read blob for all sub-command

Author: jeetchoudhary

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/storage/GitHubJsonStore.java

@@ -137,12 +137,12 @@ protected String getAndModifyJsonString(JsonElement json, String img, String tag
     }
 
     public Set<Map.Entry<String, JsonElement>> parseStoreToImagesMap(DockerfileGitHubUtil dockerfileGitHubUtil, String storeName)
-            throws IOException, InterruptedException {
+            throws IOException {
         GHMyself myself = dockerfileGitHubUtil.getMyself();
         String login = myself.getLogin();
         GHRepository store = dockerfileGitHubUtil.getRepo(Paths.get(login, storeName).toString());
 
-        GHContent storeContent = dockerfileGitHubUtil.tryRetrievingContent(store, Constants.STORE_JSON_FILE,
+        GHBlob storeContent = dockerfileGitHubUtil.tryRetrievingBlob(store, Constants.STORE_JSON_FILE,
                 store.getDefaultBranch());
 
         if (storeContent == null) {
@@ -163,7 +163,7 @@ public Set<Map.Entry<String, JsonElement>> parseStoreToImagesMap(DockerfileGitHu
         return imagesJson.getAsJsonObject().entrySet();
     }
 
-    public List<ImageTagStoreContent> getStoreContent(DockerfileGitHubUtil dockerfileGitHubUtil, String storeName) throws IOException, InterruptedException {
+    public List<ImageTagStoreContent> getStoreContent(DockerfileGitHubUtil dockerfileGitHubUtil, String storeName) throws IOException {
         Set<Map.Entry<String, JsonElement>> imageToTagStore = parseStoreToImagesMap(dockerfileGitHubUtil, storeName);
         return imageToTagStore.stream()
                 .map(entry -> new ImageTagStoreContent(entry.getKey(), entry.getValue().getAsString()))

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/storage/S3BackedImageTagStore.java

@@ -69,7 +69,7 @@ public List<ImageTagStoreContent> getStoreContent(DockerfileGitHubUtil dockerfil
         return imageNamesWithTag;
     }
 
-    private List<ImageTagStoreContent> getStoreContentSortedByAccessDate(Map<String, Date> imageNameWithAccessTime) throws InterruptedException {
+    private List<ImageTagStoreContent> getStoreContentSortedByAccessDate(Map<String, Date> imageNameWithAccessTime) {
         List<ImageTagStoreContent> imageNameWithTagSortedByAccessDate = new ArrayList<>();
         LinkedHashMap<String, Date> sortedResult = new LinkedHashMap<>();
         // Sort the content by the access date so that the file which was accessed most recently gets processed first

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/DockerfileGitHubUtil.java

@@ -257,6 +257,10 @@ public GHContent tryRetrievingContent(GHRepository repo, String path, String bra
         return gitHubUtil.tryRetrievingContent(repo, path, branch);
     }
 
+    public GHBlob tryRetrievingBlob(GHRepository repo, String path, String branch) throws IOException {
+        return gitHubUtil.tryRetrievingBlob(repo, path, branch);
+    }
+
     public void modifyOnGithub(GHContent content,
                                String branch, String img, String tag,
                                String customMessage, String ignoreImageString) throws IOException {

dockerfile-image-update/src/main/java/com/salesforce/dockerfileimageupdate/utils/GitHubUtil.java

@@ -196,6 +196,10 @@ public GHContent tryRetrievingContent(GHRepository repo, String path, String bra
         return content;
     }
 
+    public GHBlob tryRetrievingBlob(GHRepository repo, String path, String branch) throws IOException {
+        return repo.getCommit(branch).getTree().getEntry(path).asBlob();
+    }
+
     /* Workaround: The GitHub API caches API calls for up to 60 seconds, so back-to-back API calls with the same
      * command will return the same thing. i.e. the above command listRepositories will return the same output if
      * this tool is invoked twice in a row, even though it should return different lists, because of the new forks.