Skip to content

Commit e803bba

Browse files
mdesideriomdesiderio
committed
Merge branch 'release'
2 parents 6c78161 + ea9fb9a commit e803bba

File tree

429 files changed

+349
-23453
lines changed

Some content is hidden

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

429 files changed

+349
-23453
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/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
<dependency>
177177
<groupId>com.appirio.tech.core.api</groupId>
178178
<artifactId>tech.core.api</artifactId>
179-
<version>API-3.0.0.7-SNAPSHOT</version>
179+
<version>API-3.0.0.8-SNAPSHOT</version>
180180
</dependency>
181181
<dependency>
182182
<groupId>com.informix.jdbc</groupId>

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

Lines changed: 19 additions & 1 deletion
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>
@@ -156,7 +157,7 @@
156157
<dependency>
157158
<groupId>com.appirio.tech.core.api</groupId>
158159
<artifactId>tech.core.api</artifactId>
159-
<version>API-3.0.0.7-SNAPSHOT</version>
160+
<version>API-3.0.0.8-SNAPSHOT</version>
160161
</dependency>
161162
<dependency>
162163
<groupId>com.informix.jdbc</groupId>
@@ -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/dev/src/main/resources/supply-server.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,5 +148,8 @@ logging:
148148

149149
authScheme: v2
150150

151-
# fileService domain
151+
# File service domain
152152
fileServiceDomain: api.topcoder-dev.com
153+
154+
# Api version
155+
apiVersion: v3

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

Lines changed: 20 additions & 2 deletions
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>
@@ -156,7 +157,7 @@
156157
<dependency>
157158
<groupId>com.appirio.tech.core.api</groupId>
158159
<artifactId>tech.core.api</artifactId>
159-
<version>API-3.0.0.3-SNAPSHOT</version>
160+
<version>API-3.0.0.8-SNAPSHOT</version>
160161
</dependency>
161162
<dependency>
162163
<groupId>com.informix.jdbc</groupId>
@@ -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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ logging:
145145
timeZone: UTC
146146
logFormat: "%-5level [%d{yyyy-dd-mm HH:mm:ss.SSS}] [%thread] %logger - %msg%n"
147147

148-
authScheme: v2
148+
authScheme: v3
149149

150-
# fileService domain
151-
fileServiceDomain: api.topcoder-dev.com
150+
# File service domain
151+
fileServiceDomain: api.topcoder.com
152+
153+
# Api version
154+
apiVersion: v3.0.0-BETA

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

Lines changed: 22 additions & 4 deletions
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>
@@ -104,12 +105,12 @@
104105
<dependency>
105106
<groupId>appirio.platform</groupId>
106107
<artifactId>supply-library</artifactId>
107-
<version>1.0.3-SNAPSHOT</version>
108+
<version>1.0.3</version>
108109
</dependency>
109110
<dependency>
110111
<groupId>appirio.platform</groupId>
111112
<artifactId>review-microservice</artifactId>
112-
<version>1.0.2-SNAPSHOT</version>
113+
<version>1.0.2</version>
113114
</dependency>
114115
<dependency>
115116
<groupId>org.projectlombok</groupId>
@@ -156,7 +157,7 @@
156157
<dependency>
157158
<groupId>com.appirio.tech.core.api</groupId>
158159
<artifactId>tech.core.api</artifactId>
159-
<version>API-3.0.0.7-SNAPSHOT</version>
160+
<version>API-3.0.0.8-SNAPSHOT</version>
160161
</dependency>
161162
<dependency>
162163
<groupId>com.informix.jdbc</groupId>
@@ -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: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,10 @@ logging:
145145
timeZone: UTC
146146
logFormat: "%-5level [%d{yyyy-dd-mm HH:mm:ss.SSS}] [%thread] %logger - %msg%n"
147147

148-
authScheme: v2
148+
authScheme: v3
149149

150-
# fileService domain
151-
fileServiceDomain: api.topcoder-dev.com
150+
# File service domain
151+
fileServiceDomain: api.topcoder-qa.com
152+
153+
# Api version
154+
apiVersion: v3.0.0-BETA

‎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

0 commit comments

Comments
 (0)