Skip to content

Commit 1cdd3a7

Browse files
rrecharlarrecharla
committed
Merge pull request #26 from appirio-tech/1.0.1
1.0.1
2 parents 1773027 + f97a9d6 commit 1cdd3a7

File tree

427 files changed

+329
-23442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

427 files changed

+329
-23442
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
.classpath
22
.project
33
service/dependency-reduced-pom.xml
4-
service/target/*
4+
service/run-config/*/target
5+
service/target
6+
service/log
57
.idea/*
68
.DS_Store
79
*/.DS_Store

‎service/run-config/dev/pom.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
11+
<newrelic.version>3.20.0</newrelic.version>
1112
</properties>
1213
<build>
1314
<plugins>
@@ -168,6 +169,23 @@
168169
<artifactId>dropwizard-elasticsearch</artifactId>
169170
<version>0.8.0-1</version>
170171
</dependency>
172+
<dependency>
173+
<groupId>com.newrelic.agent.java</groupId>
174+
<artifactId>newrelic-java</artifactId>
175+
<version>${newrelic.version}</version>
176+
<scope>provided</scope>
177+
<type>zip</type>
178+
</dependency>
179+
<dependency>
180+
<groupId>com.newrelic.agent.java</groupId>
181+
<artifactId>newrelic-agent</artifactId>
182+
<version>${newrelic.version}</version>
183+
</dependency>
184+
<dependency>
185+
<groupId>com.newrelic.agent.java</groupId>
186+
<artifactId>newrelic-api</artifactId>
187+
<version>${newrelic.version}</version>
188+
</dependency>
171189
</dependencies>
172190
<distributionManagement>
173191
<!-- for deployment on the build server -->

‎service/run-config/prod/pom.xml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>appirio.platform</groupId>
55
<artifactId>supply-server</artifactId>
6-
<version>1.0.1-SNAPSHOT</version>
6+
<version>1.0.1</version>
77
<name>supply-server</name>
88

99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
11+
<newrelic.version>3.20.0</newrelic.version>
1112
</properties>
1213
<build>
1314
<plugins>
@@ -168,6 +169,23 @@
168169
<artifactId>dropwizard-elasticsearch</artifactId>
169170
<version>0.8.0-1</version>
170171
</dependency>
172+
<dependency>
173+
<groupId>com.newrelic.agent.java</groupId>
174+
<artifactId>newrelic-java</artifactId>
175+
<version>${newrelic.version}</version>
176+
<scope>provided</scope>
177+
<type>zip</type>
178+
</dependency>
179+
<dependency>
180+
<groupId>com.newrelic.agent.java</groupId>
181+
<artifactId>newrelic-agent</artifactId>
182+
<version>${newrelic.version}</version>
183+
</dependency>
184+
<dependency>
185+
<groupId>com.newrelic.agent.java</groupId>
186+
<artifactId>newrelic-api</artifactId>
187+
<version>${newrelic.version}</version>
188+
</dependency>
171189
</dependencies>
172190
<distributionManagement>
173191
<!-- for deployment on the build server -->

‎service/run-config/prod/src/main/resources/supply-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ logging:
148148
authScheme: v2
149149

150150
# fileService domain
151-
fileServiceDomain: api.topcoder-dev.com
151+
fileServiceDomain: api.topcoder.com

‎service/run-config/qa/pom.xml‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>appirio.platform</groupId>
55
<artifactId>supply-server</artifactId>
6-
<version>1.0.1-SNAPSHOT</version>
6+
<version>1.0.1</version>
77
<name>supply-server</name>
88

99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
11+
<newrelic.version>3.20.0</newrelic.version>
1112
</properties>
1213
<build>
1314
<plugins>
@@ -168,6 +169,23 @@
168169
<artifactId>dropwizard-elasticsearch</artifactId>
169170
<version>0.8.0-1</version>
170171
</dependency>
172+
<dependency>
173+
<groupId>com.newrelic.agent.java</groupId>
174+
<artifactId>newrelic-java</artifactId>
175+
<version>${newrelic.version}</version>
176+
<scope>provided</scope>
177+
<type>zip</type>
178+
</dependency>
179+
<dependency>
180+
<groupId>com.newrelic.agent.java</groupId>
181+
<artifactId>newrelic-agent</artifactId>
182+
<version>${newrelic.version}</version>
183+
</dependency>
184+
<dependency>
185+
<groupId>com.newrelic.agent.java</groupId>
186+
<artifactId>newrelic-api</artifactId>
187+
<version>${newrelic.version}</version>
188+
</dependency>
171189
</dependencies>
172190
<distributionManagement>
173191
<!-- for deployment on the build server -->

‎service/run-config/qa/src/main/resources/supply-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,4 +148,4 @@ logging:
148148
authScheme: v2
149149

150150
# fileService domain
151-
fileServiceDomain: api.topcoder-dev.com
151+
fileServiceDomain: api.topcoder-qa.com

‎service/src/main/java/com/appirio/service/review/dao/CopilotFeedbackDAO.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package com.appirio.service.review.dao;
22

33
import com.appirio.service.review.api.CopilotFeedback;
4+
import com.appirio.supply.dataaccess.ApiQueryInput;
45
import com.appirio.supply.dataaccess.DatasourceName;
6+
import com.appirio.supply.dataaccess.QueryResult;
57
import com.appirio.supply.dataaccess.SqlQueryFile;
8+
import com.appirio.tech.core.api.v3.request.QueryParameter;
69
import org.skife.jdbi.v2.sqlobject.Bind;
710

811
import java.util.List;
@@ -18,5 +21,5 @@ public interface CopilotFeedbackDAO {
1821
* @return CopilotFeedback Copilot feedback
1922
*/
2023
@SqlQueryFile("sql/copilot/copilot-feedback-query.sql")
21-
List<CopilotFeedback> getCopilotFeedbackByCopilotId(@Bind("userId") Long userId);
24+
QueryResult<List<CopilotFeedback>> getCopilotFeedbackByCopilotId(@Bind("userId") Long userId, @ApiQueryInput QueryParameter param);
2225
}

‎service/src/main/java/com/appirio/service/review/dao/ReviewDAO.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
package com.appirio.service.review.dao;
22

3-
import java.util.List;
4-
import java.util.Map;
5-
6-
import org.skife.jdbi.v2.sqlobject.Bind;
7-
import org.skife.jdbi.v2.sqlobject.BindBean;
8-
93
import com.appirio.service.review.api.Review;
104
import com.appirio.service.review.authorization.manager.ReviewAuthorizationManager;
11-
import com.appirio.supply.dataaccess.ApiQueryInput;
12-
import com.appirio.supply.dataaccess.ApiUser;
13-
import com.appirio.supply.dataaccess.DatasourceName;
14-
import com.appirio.supply.dataaccess.SqlQueryFile;
15-
import com.appirio.supply.dataaccess.SqlUpdateFile;
5+
import com.appirio.supply.dataaccess.*;
166
import com.appirio.supply.dataaccess.api.audit.Audit;
177
import com.appirio.supply.dataaccess.api.audit.AuditActionPerformer;
188
import com.appirio.supply.dataaccess.api.validation.Validate;
@@ -21,6 +11,11 @@
2111
import com.appirio.supply.dataaccess.authorization.AuthorizationContext;
2212
import com.appirio.tech.core.api.v3.request.QueryParameter;
2313
import com.appirio.tech.core.auth.AuthUser;
14+
import org.skife.jdbi.v2.sqlobject.Bind;
15+
import org.skife.jdbi.v2.sqlobject.BindBean;
16+
17+
import java.util.List;
18+
import java.util.Map;
2419

2520
/**
2621
* DAO to handle review data
@@ -126,7 +121,7 @@ List<Map<String, Object>> getNextSubmissionToReviewByLeastReviewed(
126121
*/
127122
@SqlQueryFile("sql/review/review-query.sql")
128123
@AuthManager(ReviewAuthorizationManager.class)
129-
List<Review> getReviews(@ApiUser AuthUser auth,
124+
QueryResult<List<Review>> getReviews(@ApiUser AuthUser auth,
130125
@ApiQueryInput QueryParameter queryParameter,
131126
@AuthContext AuthorizationContext authContext);
132127

‎service/src/main/java/com/appirio/service/review/dao/ReviewItemDAO.java‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,9 @@
11
package com.appirio.service.review.dao;
22

3-
import java.util.List;
4-
import java.util.Map;
5-
6-
import org.skife.jdbi.v2.sqlobject.Bind;
7-
import org.skife.jdbi.v2.sqlobject.BindBean;
8-
93
import com.appirio.service.review.api.ReviewItem;
104
import com.appirio.service.review.authorization.manager.ReviewItemAuthorizationManager;
115
import com.appirio.supply.ValidationException;
12-
import com.appirio.supply.dataaccess.ApiQueryInput;
13-
import com.appirio.supply.dataaccess.ApiUser;
14-
import com.appirio.supply.dataaccess.DatasourceName;
15-
import com.appirio.supply.dataaccess.SqlBatchFile;
16-
import com.appirio.supply.dataaccess.SqlQueryFile;
6+
import com.appirio.supply.dataaccess.*;
177
import com.appirio.supply.dataaccess.api.audit.Audit;
188
import com.appirio.supply.dataaccess.api.audit.AuditActionPerformer;
199
import com.appirio.supply.dataaccess.api.validation.Validate;
@@ -22,6 +12,11 @@
2212
import com.appirio.supply.dataaccess.authorization.AuthorizationContext;
2313
import com.appirio.tech.core.api.v3.request.QueryParameter;
2414
import com.appirio.tech.core.auth.AuthUser;
15+
import org.skife.jdbi.v2.sqlobject.Bind;
16+
import org.skife.jdbi.v2.sqlobject.BindBean;
17+
18+
import java.util.List;
19+
import java.util.Map;
2520

2621
/**
2722
* DAO to access review item information
@@ -83,7 +78,7 @@ List<Map<String, Object>> getReviewItemsScoreByReview(
8378
*/
8479
@SqlQueryFile("sql/review-item/review-item-query.sql")
8580
@AuthManager(ReviewItemAuthorizationManager.class)
86-
List<ReviewItem> getReviewItems(@ApiUser AuthUser auth,
81+
QueryResult<List<ReviewItem>> getReviewItems(@ApiUser AuthUser auth,
8782
@ApiQueryInput QueryParameter queryParameter,
8883
@AuthContext AuthorizationContext authContext);
8984

‎service/src/main/java/com/appirio/service/review/dao/ScorecardDAO.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
11
package com.appirio.service.review.dao;
22

3-
import java.util.List;
4-
import java.util.Map;
5-
6-
import org.skife.jdbi.v2.sqlobject.Bind;
7-
83
import com.appirio.service.review.api.Scorecard;
9-
import com.appirio.supply.dataaccess.ApiQueryInput;
10-
import com.appirio.supply.dataaccess.ApiUser;
11-
import com.appirio.supply.dataaccess.DatasourceName;
12-
import com.appirio.supply.dataaccess.SqlQueryFile;
4+
import com.appirio.supply.dataaccess.*;
135
import com.appirio.tech.core.api.v3.request.QueryParameter;
146
import com.appirio.tech.core.auth.AuthUser;
7+
import org.skife.jdbi.v2.sqlobject.Bind;
8+
9+
import java.util.List;
10+
import java.util.Map;
1511

1612
/**
1713
* DAO to access scorecard information
@@ -50,5 +46,5 @@ Map<String, Object> getReviewPhaseAndScorecard(
5046
* @return list of scorecard objects
5147
*/
5248
@SqlQueryFile("sql/scorecard/scorecard-query.sql")
53-
List<Scorecard> getScorecards(@ApiUser AuthUser auth, @ApiQueryInput QueryParameter queryParameter);
54-
}
49+
QueryResult<List<Scorecard>> getScorecards(@ApiUser AuthUser auth, @ApiQueryInput QueryParameter queryParameter);
50+
}

0 commit comments

Comments
 (0)