upgrade to CORE 4.0.0

skyhit · skyhit · commit dea7ff2e492b · 2016-10-04T20:26:31.000+08:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Work Microservice
+# Review Microservice
 A microservice for generic units of work (e.g., a challenge)
 
 ## Getting Started
@@ -8,7 +8,7 @@ This microservice is using [dropwizard](dropwizard.io) as the REST API framework
 We are using Maven 2 to build and building is as simple as `mvn package`. *Make sure you are using Java 8 for build and runtime*
 
 ### Configuration
-Configuration is managed through a yaml file. The `src/main/resources/work-service.yaml` file should contain the necessary configuration for you to run locally.
+Configuration is managed through a yaml file. The `src/main/resources/review-service.yaml` file should contain the necessary configuration for you to run locally.
 
 ### Framework Stack
 - dropwizard-core - core REST API
@@ -22,30 +22,28 @@ Configuration is managed through a yaml file. The `src/main/resources/work-servi
 ### Database
 We are using mysql RDS for the database. For development use, connect to the topcoder-dev instance. Database access should be limited to the DAO layer. We are using the [JDBI](http://jdbi.org/) framework for database access. Where possible we should use the [SQL Objects API](http://jdbi.org/sql_object_overview/) approach listed in the JDBI documentation. 
 
-For this service, the DAO is managed by `WorkItemDAO`
+For this service, the DAO is managed by `ReviewDAO`
 
 **We need to keep the data model clean and name properties of our representation (model) objects as the column names so we can use the automatic bean mapping facilities instead of needing to manually wire things together. Any deviation requires prior approval.**
 
 ### API Endpoint
-The API endpoint for this service is `com.appirio.service.work.resources.WorkItemResource` It contains the specific resource paths supported by this service. The root of the service is /v3/workitem. API methods should be annotated with the appropriate jax-rs annotations and the `@Timed` annotation for metrics. An example method is shown below.
+The API endpoint for this service is `com.appirio.service.review.resources.ReviewResource` It contains the specific resource paths supported by this service. The root of the service is /v3/reviews. API methods should be annotated with the appropriate jax-rs annotations and the `@Timed` annotation for metrics. An example method is shown below.
 ```
 @GET
 @Timed
-@Path("{id}")
-public WorkItem getWorkItemById(@Auth TCAuth auth, @PathParam("id") LongParam id) {
-	logger.debug("get work item for id {}", id);
+public ApiResponse getReviews(@Auth AuthUser auth, 
+		@APIQueryParam(repClass = Review.class) QueryParameter queryParameter)
+	logger.debug("getReviews, filter : " + queryParameter.getFilter().getFields());
 
-	WorkItem wi = dao.findWorkItemById(id.get());
-	return wi;
+	return MetadataApiResponseFactory.createResponse(reviewManager.getReviews(auth, queryParameter,
+                    new BaseAuthorizationContext(auth)));
 }
 ```
 
 Note the `TCAuth` parameter provided by the `ServiceAuthenticator` class will provide user auth information and is a required parameterfor all secured API calls.
+You must set up `TC_JWT_KEY` environment variable, the sample value is `4WvoZLWhFPZ5jauw2+XCU+p772S4oBN25tNPyjHR`.
 
 ### Testing
 All API endpoint methods should have unit tests. For this service we are following the dropwizard testing recommendations as described [here](http://dropwizard.io/manual/testing.html) 
 
 For manual API testing, the [postman chrome app](https://chrome.google.com/webstore/detail/postman-rest-client/fdmmgilgnpjigdojojpjoooidkmcomcm?hl=en) is useful.
-
-### Healthcheck
-This service has a healhcheck service located at `com.appirio.service.work.health.ServiceHealthCheck`. If any new dependent services are added, the healthcheck service should be updated to test its availability in order to determine if this service is healthy. This is important for application monitoring and failover.
diff --git a/local/docker-compose.yml b/local/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '2'
+services:
+    informix:
+        image: "appiriodevops/informix:1b3d4ef"
+        ports:
+            - "2021:2021"
+    kafka:
+        image: spotify/kafka
+        environment:
+            ADVERTISED_HOST: $DOCKER_IP
+            ADVERTISED_PORT: 9092
+        ports:
+            - "2181:2181"
+            - "9092:9092"
diff --git a/service/pom.xml b/service/pom.xml
@@ -6,9 +6,12 @@
 	<version>1.0.2-SNAPSHOT</version>
 	<name>Review Microservice</name>
 	<properties>
-		<dropwizard.version>0.7.1</dropwizard.version>
-		<powermock.version>1.5.4</powermock.version>
-		<jackson-version>2.7.3</jackson-version>
+	    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	    <dropwizard.version>1.0.0</dropwizard.version>
+	    <powermock.version>1.5.4</powermock.version>
+	    <jackson-version>2.7.3</jackson-version>
+	    <core.api.version>4.0.0</core.api.version>
+	    <supply-library.version>1.0.15-SNAPSHOT</supply-library.version>
 	</properties>
 
 	<build>
@@ -124,7 +127,7 @@
 		<dependency>
 			<groupId>appirio.platform</groupId>
 			<artifactId>supply-library</artifactId>
-			<version>1.0.7-SNAPSHOT</version>
+			<version>${supply-library.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -175,9 +178,9 @@
 			<version>${dropwizard.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.appirio.tech.core.api</groupId>
-			<artifactId>tech.core.api</artifactId>
-			<version>API-3.0.0.8-SNAPSHOT</version>
+			<groupId>com.topcoder</groupId>
+			<artifactId>core.api</artifactId>
+			<version>${core.api.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.informix.jdbc</groupId>
diff --git a/service/src/main/java/com/appirio/service/review/resources/ScorecardQuestionResource.java b/service/src/main/java/com/appirio/service/review/resources/ScorecardQuestionResource.java
@@ -6,18 +6,20 @@
 import com.appirio.supply.ErrorHandler;
 import com.appirio.tech.core.api.v3.request.QueryParameter;
 import com.appirio.tech.core.api.v3.request.annotation.APIQueryParam;
+import com.appirio.tech.core.api.v3.request.annotation.AllowAnonymous;
 import com.appirio.tech.core.api.v3.response.ApiResponse;
 import com.appirio.tech.core.auth.AuthUser;
 import com.codahale.metrics.annotation.Timed;
-import io.dropwizard.auth.Auth;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.SecurityContext;
 
 /**
  * Resource to expose scorecard question REST API
@@ -49,15 +51,17 @@ public ScorecardQuestionResource(ScorecardQuestionManager scorecardQuestionManag
     /**
      * Fetches scorecard questions based on API query parameters
      * 
-     * @param auth           authentication user
      * @param queryParameter query parameter
+     * @param securityContext           security context
      * @return               api response
      */
     @GET
     @Timed
-    public ApiResponse getScorecardQuestions(@Auth(required = false) AuthUser auth, @APIQueryParam(repClass = Scorecard.class) QueryParameter queryParameter) {
+    @AllowAnonymous
+    public ApiResponse getScorecardQuestions(@APIQueryParam(repClass = Scorecard.class) QueryParameter queryParameter, @Context SecurityContext securityContext) {
         try {
             logger.debug("getScorecardQuestions, filter : " + queryParameter.getFilter().getFields());
+            AuthUser auth = (AuthUser)securityContext.getUserPrincipal();
             return MetadataApiResponseFactory.createResponse(scorecardQuestionManager.
                     getScorecardQuestions(auth, queryParameter));
         } catch (Exception e) {
diff --git a/service/src/main/java/com/appirio/service/review/resources/ScorecardResource.java b/service/src/main/java/com/appirio/service/review/resources/ScorecardResource.java
@@ -6,18 +6,20 @@
 import com.appirio.supply.ErrorHandler;
 import com.appirio.tech.core.api.v3.request.QueryParameter;
 import com.appirio.tech.core.api.v3.request.annotation.APIQueryParam;
+import com.appirio.tech.core.api.v3.request.annotation.AllowAnonymous;
 import com.appirio.tech.core.api.v3.response.ApiResponse;
 import com.appirio.tech.core.auth.AuthUser;
 import com.codahale.metrics.annotation.Timed;
-import io.dropwizard.auth.Auth;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.SecurityContext;
 
 /**
  * Resource to expose scorecard REST API
@@ -53,15 +55,18 @@ public ScorecardResource(ScorecardManager scorecardManager) {
     /**
      * Fetches scorecards based on the API query parameters
      * 
-     * @param auth           authentication user
      * @param queryParameter query parameter
+     * @param securityContext           security context
      * @return               api response
      */
     @GET
     @Timed
-    public ApiResponse getScorecards(@Auth(required = false) AuthUser auth, @APIQueryParam(repClass = Scorecard.class) QueryParameter queryParameter) {
+    @AllowAnonymous
+    public ApiResponse getScorecards(@APIQueryParam(repClass = Scorecard.class) QueryParameter
+            queryParameter, @Context SecurityContext securityContext) {
         try {
             logger.debug("getScorecards, filter : " + queryParameter.getFilter().getFields());
+            AuthUser auth = (AuthUser)securityContext.getUserPrincipal();
             return MetadataApiResponseFactory.createResponse(scorecardManager
                     .getScorecards(auth, queryParameter));
         } catch (Exception e) {
diff --git a/service/src/main/resources/review-service.yaml b/service/src/main/resources/review-service.yaml
@@ -11,15 +11,17 @@ databases:
     driverClass: com.informix.jdbc.IfxDriver
 
     # the username
-    user: coder
+    user: "${OLTP_USER}"
+
+    password: "${OLTP_PW}"
 
     # the password
     # NOTE: password is set as a java system property: i.e., -Ddw.database.password=<password>
 
     validationQuery: select 1 from systables
 
     # the JDBC URL
-    url: jdbc:informix-sqli://localhost:2021/tcs_catalog:INFORMIXSERVER=informixoltp_tcp;IFX_LOCK_MODE_WAIT=5;OPTCOMPIND=0;STMT_CACHE=1;
+    url: "${OLTP_URL}"
 
     # the minimum number of connections to keep open
     minSize: 2
@@ -36,15 +38,17 @@ databases:
     driverClass: com.informix.jdbc.IfxDriver
 
     # the username
-    user: coder
+    user: "${DW_USER}"
+
+    password: "${DW_PW}"
 
     # the password
     # NOTE: password is set as a java system property: i.e., -Ddw.database.password=<password>
 
     validationQuery: select 1 from systables
 
     # the JDBC URL
-    url: jdbc:informix-sqli://localhost:2021/topcoder_dw:INFORMIXSERVER=datawarehouse_tcp;IFX_LOCK_MODE_WAIT=5;OPTCOMPIND=0;STMT_CACHE=1;
+    url: "${DW_URL}"
 
     # the minimum number of connections to keep open
     minSize: 2
@@ -64,6 +68,7 @@ databases:
 #    port: 8080
 
 server:
+  rootPath: '/v3/*'
 #  softNofileLimit: 1000
 #  hardNofileLimit: 1000
   applicationConnectors:
diff --git a/service/src/test/java/com/appirio/service/test/resources/ScorecardQuestionResourceTest.java b/service/src/test/java/com/appirio/service/test/resources/ScorecardQuestionResourceTest.java
@@ -6,6 +6,10 @@
 import com.appirio.supply.SupplyException;
 import org.junit.Test;
 
+import javax.ws.rs.core.SecurityContext;
+
+import java.security.Principal;
+
 import static org.mockito.Mockito.*;
 
 public class ScorecardQuestionResourceTest extends BaseTest {
@@ -14,7 +18,28 @@ public class ScorecardQuestionResourceTest extends BaseTest {
 
     @Test
     public void testGetScoreCards() throws SupplyException {
-        unit.getScorecardQuestions(createUser("1"), createQueryParam(""));
+        SecurityContext securityContext = new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return createUser("1");
+            }
+
+            @Override
+            public boolean isUserInRole(String s) {
+                return false;
+            }
+
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        };
+        unit.getScorecardQuestions(createQueryParam(""), securityContext);
         verify(mockScorecardQuestionManager).getScorecardQuestions(anyObject(),anyObject());
     }
 
diff --git a/service/src/test/java/com/appirio/service/test/resources/ScorecardResourceTest.java b/service/src/test/java/com/appirio/service/test/resources/ScorecardResourceTest.java
@@ -1,22 +1,46 @@
 package com.appirio.service.test.resources;
 
 import com.appirio.service.review.manager.ScorecardManager;
-import static org.mockito.Mockito.*;
-import static org.junit.Assert.*;
-
 import com.appirio.service.review.resources.ScorecardResource;
 import com.appirio.service.test.BaseTest;
 import com.appirio.supply.SupplyException;
-import org.junit.Before;
 import org.junit.Test;
 
+import javax.ws.rs.core.SecurityContext;
+import java.security.Principal;
+
+import static org.mockito.Mockito.anyObject;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
 public class ScorecardResourceTest extends BaseTest {
     public static final ScorecardManager mockScorecardManager = mock(ScorecardManager.class);
     public static final ScorecardResource unit = new ScorecardResource(mockScorecardManager);
 
     @Test
     public void testGetScoreCards() throws SupplyException {
-        unit.getScorecards(createUser("1"),createQueryParam(""));
+        SecurityContext securityContext = new SecurityContext() {
+            @Override
+            public Principal getUserPrincipal() {
+                return createUser("1");
+            }
+
+            @Override
+            public boolean isUserInRole(String s) {
+                return false;
+            }
+
+            @Override
+            public boolean isSecure() {
+                return false;
+            }
+
+            @Override
+            public String getAuthenticationScheme() {
+                return null;
+            }
+        };
+        unit.getScorecards(createQueryParam(""), securityContext);
         verify(mockScorecardManager).getScorecards(anyObject(),anyObject());
     }
 
