test cleanup

Author: Derek Wasinger

src/main/java/com/redhat/labs/omp/models/gitlab/Namespace.java

@@ -3,10 +3,12 @@
 import javax.json.bind.annotation.JsonbProperty;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class Namespace {

src/main/java/com/redhat/labs/omp/models/gitlab/ProjectSearchResults.java

@@ -3,10 +3,12 @@
 import javax.json.bind.annotation.JsonbProperty;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 @Data
+@Builder
 @NoArgsConstructor
 @AllArgsConstructor
 public class ProjectSearchResults {

src/main/java/com/redhat/labs/omp/resources/CacheResource.java renamed to src/main/java/com/redhat/labs/omp/resource/CacheResource.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import java.util.Optional;
 
@@ -17,7 +17,7 @@
 import com.redhat.labs.cache.cacheStore.EngagementDataCache;
 import com.redhat.labs.exception.FileNotFoundException;
 import com.redhat.labs.omp.models.gitlab.File;
-import com.redhat.labs.omp.resources.filters.Logged;
+import com.redhat.labs.omp.resources.filter.Logged;
 import com.redhat.labs.omp.service.FileService;
 
 @Path("/api/cache")

src/main/java/com/redhat/labs/omp/resources/EngagementResource.java renamed to src/main/java/com/redhat/labs/omp/resource/EngagementResource.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
@@ -37,7 +37,7 @@ public class EngagementResource {
     public Response createEngagement(Engagement engagement, @Context UriInfo uriInfo) {
 
         Project project = engagementService.createEngagement(engagement);
-        
+
         UriBuilder builder = uriInfo.getAbsolutePathBuilder();
         builder.path(Integer.toString(project.getId()));
         return Response.created(builder.build()).build();

src/main/java/com/redhat/labs/omp/resources/FileResource.java renamed to src/main/java/com/redhat/labs/omp/resource/FileResource.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import java.util.Optional;
 

src/main/java/com/redhat/labs/omp/resources/GroupResource.java renamed to src/main/java/com/redhat/labs/omp/resource/GroupResource.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import java.util.Optional;
 

src/main/java/com/redhat/labs/omp/resources/LegacyFileResource.java renamed to src/main/java/com/redhat/labs/omp/resource/LegacyResource.java

@@ -1,36 +1,56 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import java.util.Optional;
 
 import javax.inject.Inject;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
 
 import org.apache.http.HttpStatus;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
+import com.redhat.labs.omp.models.Engagement;
 import com.redhat.labs.omp.models.gitlab.File;
-import com.redhat.labs.omp.resources.filters.Logged;
+import com.redhat.labs.omp.models.gitlab.Project;
+import com.redhat.labs.omp.resources.filter.Logged;
+import com.redhat.labs.omp.service.EngagementService;
 import com.redhat.labs.omp.service.FileService;
 
-@Path("/api/file")
+@Path("/api")
 @Produces(MediaType.APPLICATION_JSON)
 @Consumes(MediaType.APPLICATION_JSON)
-public class LegacyFileResource {
+public class LegacyResource {
+
+    /*
+     * 
+     * 
+     * NOTE:  This resource should be removed once the OMP Backend API 
+     *        has been updated to point to the /api/v1/* endpoints
+     * 
+     * 
+     */
 
     @Inject
     FileService fileService;
 
+    @Inject
+    EngagementService engagementService;
+
     @ConfigProperty(name = "file_branch", defaultValue = "master")
     protected String defaultBranch;
 
     @GET
     @Logged
+    @Path("/file")
     public Response getFileFromGitByName(@QueryParam("name") String fileName, @QueryParam("repo_id") Integer repoId,
             @QueryParam("branch") String branch) {
         Optional<File> optional = fileService.getFile(repoId, fileName, (null == branch) ? defaultBranch : branch);
@@ -42,4 +62,16 @@ public Response getFileFromGitByName(@QueryParam("name") String fileName, @Query
 
     }
 
+    @POST
+    @Path("/residencies")
+    public Response createEngagement(Engagement engagement, @Context UriInfo uriInfo) {
+
+        Project project = engagementService.createEngagement(engagement);
+
+        UriBuilder builder = uriInfo.getAbsolutePathBuilder();
+        builder.path(Integer.toString(project.getId()));
+        return Response.created(builder.build()).build();
+
+    }
+
 }

src/main/java/com/redhat/labs/omp/resources/ProjectResource.java renamed to src/main/java/com/redhat/labs/omp/resource/ProjectResource.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources;
+package com.redhat.labs.omp.resource;
 
 import java.util.Optional;
 

src/main/java/com/redhat/labs/omp/resources/filters/Logged.java renamed to src/main/java/com/redhat/labs/omp/resources/filter/Logged.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources.filters;
+package com.redhat.labs.omp.resources.filter;
 
 import javax.ws.rs.NameBinding;
 import java.lang.annotation.Retention;

src/main/java/com/redhat/labs/omp/resources/filters/RequestLoggingFilter.java renamed to src/main/java/com/redhat/labs/omp/resources/filter/RequestLoggingFilter.java

@@ -1,4 +1,4 @@
-package com.redhat.labs.omp.resources.filters;
+package com.redhat.labs.omp.resources.filter;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;