cleanup

Author: Derek Wasinger

src/main/java/com/redhat/labs/cache/GitSyncService.java

@@ -7,7 +7,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.redhat.labs.cache.cacheStore.ResidencyDataCache;
-import com.redhat.labs.omp.models.gitlab.response.RepositoryFile;
+import com.redhat.labs.omp.models.gitlab.File;
 
 import io.quarkus.vertx.ConsumeEvent;
 
@@ -21,7 +21,7 @@ public class GitSyncService {
     ResidencyDataCache cache;
 
     @ConsumeEvent(FILE_CACHE_EVENT)
-    public void consumeTemplate(RepositoryFile message) {
+    public void consumeTemplate(File message) {
         LOGGER.warn("Caching repo file event::::  {} ", message.getCacheKey());
         cache.store(message);
     }

src/main/java/com/redhat/labs/cache/ResidencyDataStore.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import com.redhat.labs.omp.models.gitlab.response.RepositoryFile;
+import com.redhat.labs.omp.models.gitlab.File;
 
 /**
  * This interface defines the contract to store data for the received events.
@@ -22,7 +22,7 @@ public interface ResidencyDataStore {
      */
     public void store(String key, ResidencyInformation residencyInformation);
 
-    public void store(RepositoryFile file);
+    public void store(File file);
 
     /**
      * return NULL if the key is not present

src/main/java/com/redhat/labs/cache/cacheStore/ResidencyDataCache.java

@@ -17,7 +17,7 @@
 
 import com.redhat.labs.cache.ResidencyDataStore;
 import com.redhat.labs.cache.ResidencyInformation;
-import com.redhat.labs.omp.models.gitlab.response.RepositoryFile;
+import com.redhat.labs.omp.models.gitlab.File;
 
 import io.quarkus.infinispan.client.Remote;
 import io.quarkus.runtime.StartupEvent;
@@ -55,8 +55,8 @@ public void store(String key, ResidencyInformation residencyInformation) {
     }
 
     @Override
-    public void store(RepositoryFile file) {
-        cache.put(file.getCacheKey(),  file.getFileContent());
+    public void store(File file) {
+        cache.put(file.getCacheKey(),  file.getContent());
     }
 
     public void store(String key, String file) {

src/main/java/com/redhat/labs/omp/models/CreateResidencyGroupStructure.java

@@ -4,6 +4,7 @@
 import java.nio.charset.StandardCharsets;
 
 import javax.json.bind.annotation.JsonbProperty;
+import javax.json.bind.annotation.JsonbTransient;
 import javax.validation.constraints.NotBlank;
 
 import com.redhat.labs.exception.EncodingException;
@@ -43,6 +44,9 @@ public class File {
     @JsonbProperty("author_name")
     private String authorName;
 
+    @JsonbTransient
+    private String cacheKey;
+
     public void encodeFileAttributes() {
 
         // encode file path