Skip to content

Commit 0a4f641

Browse files
rrecharlarrecharla
committed
Merge pull request #38 from appirio-tech/release
Merge release to master
2 parents 75a5e4c + 4c4603a commit 0a4f641

File tree

11 files changed

+238
-81
lines changed

11 files changed

+238
-81
lines changed

‎service/pom.xml‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<properties>
99
<dropwizard.version>0.7.1</dropwizard.version>
1010
<powermock.version>1.5.4</powermock.version>
11+
<jackson-version>[2.5.1,)</jackson-version>
1112
</properties>
1213

1314
<build>
@@ -123,7 +124,7 @@
123124
<dependency>
124125
<groupId>appirio.platform</groupId>
125126
<artifactId>supply-library</artifactId>
126-
<version>1.0.3</version>
127+
<version>1.0.7-SNAPSHOT</version>
127128
</dependency>
128129
<dependency>
129130
<groupId>org.projectlombok</groupId>
@@ -183,6 +184,55 @@
183184
<artifactId>com.springsource.com.informix.jdbc</artifactId>
184185
<version>3.0.0.JC3</version>
185186
</dependency>
187+
<dependency>
188+
<groupId>com.fasterxml.jackson.core</groupId>
189+
<artifactId>jackson-core</artifactId>
190+
<version>${jackson-version}</version>
191+
</dependency>
192+
<dependency>
193+
<groupId>com.fasterxml.jackson.core</groupId>
194+
<artifactId>jackson-databind</artifactId>
195+
<version>${jackson-version}</version>
196+
</dependency>
197+
<dependency>
198+
<groupId>com.fasterxml.jackson.datatype</groupId>
199+
<artifactId>jackson-datatype-joda</artifactId>
200+
<version>${jackson-version}</version>
201+
</dependency>
202+
<dependency>
203+
<groupId>com.fasterxml.jackson.module</groupId>
204+
<artifactId>jackson-module-jaxb-annotations</artifactId>
205+
<version>${jackson-version}</version>
206+
</dependency>
207+
<dependency>
208+
<groupId>com.fasterxml.jackson.module</groupId>
209+
<artifactId>jackson-module-afterburner</artifactId>
210+
<version>${jackson-version}</version>
211+
</dependency>
212+
<dependency>
213+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
214+
<artifactId>jackson-jaxrs-json-provider</artifactId>
215+
<version>${jackson-version}</version>
216+
</dependency>
217+
<dependency>
218+
<groupId>com.appirio</groupId>
219+
<artifactId>ap-events-bus</artifactId>
220+
<version>0.0.2-SNAPSHOT</version>
221+
<exclusions>
222+
<exclusion>
223+
<groupId>org.slf4j</groupId>
224+
<artifactId>slf4j-log4j12</artifactId>
225+
</exclusion>
226+
<exclusion>
227+
<groupId>log4j</groupId>
228+
<artifactId>log4j</artifactId>
229+
</exclusion>
230+
<exclusion>
231+
<groupId>com.fasterxml.jackson</groupId>
232+
<artifactId>*</artifactId>
233+
</exclusion>
234+
</exclusions>
235+
</dependency>
186236
</dependencies>
187237
<distributionManagement>
188238
<!-- for deployment on the build server -->

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
1111
<newrelic.version>3.20.0</newrelic.version>
12+
<jackson-version>[2.5.1,)</jackson-version>
1213
</properties>
1314
<build>
1415
<plugins>
@@ -26,6 +27,7 @@
2627
<exclude>**/*Test*.class</exclude>
2728
</excludes>
2829
</instrumentation>
30+
<check/>
2931
</configuration>
3032
<executions>
3133
<execution>
@@ -107,10 +109,40 @@
107109
<artifactId>dropwizard-jobs-core</artifactId>
108110
<version>1.0.1</version>
109111
</dependency>
112+
<dependency>
113+
<groupId>com.fasterxml.jackson.core</groupId>
114+
<artifactId>jackson-core</artifactId>
115+
<version>${jackson-version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.fasterxml.jackson.core</groupId>
119+
<artifactId>jackson-databind</artifactId>
120+
<version>${jackson-version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.fasterxml.jackson.datatype</groupId>
124+
<artifactId>jackson-datatype-joda</artifactId>
125+
<version>${jackson-version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>com.fasterxml.jackson.module</groupId>
129+
<artifactId>jackson-module-jaxb-annotations</artifactId>
130+
<version>${jackson-version}</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>com.fasterxml.jackson.module</groupId>
134+
<artifactId>jackson-module-afterburner</artifactId>
135+
<version>${jackson-version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
139+
<artifactId>jackson-jaxrs-json-provider</artifactId>
140+
<version>${jackson-version}</version>
141+
</dependency>
110142
<dependency>
111143
<groupId>appirio.platform</groupId>
112144
<artifactId>supply-library</artifactId>
113-
<version>1.0.3-SNAPSHOT</version>
145+
<version>1.0.7-SNAPSHOT</version>
114146
</dependency>
115147
<dependency>
116148
<groupId>appirio.platform</groupId>

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
1111
<newrelic.version>3.20.0</newrelic.version>
12+
<jackson-version>[2.5.1,)</jackson-version>
1213
</properties>
1314
<build>
1415
<plugins>
@@ -26,6 +27,7 @@
2627
<exclude>**/*Test*.class</exclude>
2728
</excludes>
2829
</instrumentation>
30+
<check/>
2931
</configuration>
3032
<executions>
3133
<execution>
@@ -107,10 +109,40 @@
107109
<artifactId>dropwizard-jobs-core</artifactId>
108110
<version>1.0.1</version>
109111
</dependency>
112+
<dependency>
113+
<groupId>com.fasterxml.jackson.core</groupId>
114+
<artifactId>jackson-core</artifactId>
115+
<version>${jackson-version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.fasterxml.jackson.core</groupId>
119+
<artifactId>jackson-databind</artifactId>
120+
<version>${jackson-version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.fasterxml.jackson.datatype</groupId>
124+
<artifactId>jackson-datatype-joda</artifactId>
125+
<version>${jackson-version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>com.fasterxml.jackson.module</groupId>
129+
<artifactId>jackson-module-jaxb-annotations</artifactId>
130+
<version>${jackson-version}</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>com.fasterxml.jackson.module</groupId>
134+
<artifactId>jackson-module-afterburner</artifactId>
135+
<version>${jackson-version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
139+
<artifactId>jackson-jaxrs-json-provider</artifactId>
140+
<version>${jackson-version}</version>
141+
</dependency>
110142
<dependency>
111143
<groupId>appirio.platform</groupId>
112144
<artifactId>supply-library</artifactId>
113-
<version>1.0.3</version>
145+
<version>1.0.7-SNAPSHOT</version>
114146
</dependency>
115147
<dependency>
116148
<groupId>appirio.platform</groupId>

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<properties>
1010
<dropwizard.version>0.7.1</dropwizard.version>
1111
<newrelic.version>3.20.0</newrelic.version>
12+
<jackson-version>[2.5.1,)</jackson-version>
1213
</properties>
1314
<build>
1415
<plugins>
@@ -26,6 +27,7 @@
2627
<exclude>**/*Test*.class</exclude>
2728
</excludes>
2829
</instrumentation>
30+
<check/>
2931
</configuration>
3032
<executions>
3133
<execution>
@@ -107,10 +109,40 @@
107109
<artifactId>dropwizard-jobs-core</artifactId>
108110
<version>1.0.1</version>
109111
</dependency>
112+
<dependency>
113+
<groupId>com.fasterxml.jackson.core</groupId>
114+
<artifactId>jackson-core</artifactId>
115+
<version>${jackson-version}</version>
116+
</dependency>
117+
<dependency>
118+
<groupId>com.fasterxml.jackson.core</groupId>
119+
<artifactId>jackson-databind</artifactId>
120+
<version>${jackson-version}</version>
121+
</dependency>
122+
<dependency>
123+
<groupId>com.fasterxml.jackson.datatype</groupId>
124+
<artifactId>jackson-datatype-joda</artifactId>
125+
<version>${jackson-version}</version>
126+
</dependency>
127+
<dependency>
128+
<groupId>com.fasterxml.jackson.module</groupId>
129+
<artifactId>jackson-module-jaxb-annotations</artifactId>
130+
<version>${jackson-version}</version>
131+
</dependency>
132+
<dependency>
133+
<groupId>com.fasterxml.jackson.module</groupId>
134+
<artifactId>jackson-module-afterburner</artifactId>
135+
<version>${jackson-version}</version>
136+
</dependency>
137+
<dependency>
138+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
139+
<artifactId>jackson-jaxrs-json-provider</artifactId>
140+
<version>${jackson-version}</version>
141+
</dependency>
110142
<dependency>
111143
<groupId>appirio.platform</groupId>
112144
<artifactId>supply-library</artifactId>
113-
<version>1.0.3</version>
145+
<version>1.0.7-SNAPSHOT</version>
114146
</dependency>
115147
<dependency>
116148
<groupId>appirio.platform</groupId>

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

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

3-
import java.util.List;
4-
5-
import org.skife.jdbi.v2.sqlobject.BindBean;
6-
73
import com.appirio.service.review.api.ProjectResult;
84
import com.appirio.supply.dataaccess.DatasourceName;
95
import com.appirio.supply.dataaccess.SqlBatchFile;
106
import com.appirio.supply.dataaccess.api.audit.Audit;
11-
import com.appirio.supply.dataaccess.api.audit.AuditActionPerformer;
127
import com.appirio.supply.dataaccess.api.validation.Validate;
8+
import org.skife.jdbi.v2.sqlobject.BindBean;
9+
10+
import java.util.List;
1311

1412
/**
1513
* DAO to interact with project result data
@@ -22,9 +20,8 @@ public interface ProjectResultDAO {
2220
/**
2321
* Batch inserts new project result records
2422
* @param results results to insert
25-
* @param userId user id used for auditing purposes
2623
*/
2724
@SqlBatchFile("sql/project-result/project-result-update.sql")
28-
void updateProjectResults(@BindBean @Audit @Validate List<ProjectResult> results, @AuditActionPerformer Long userId);
25+
void updateProjectResults(@BindBean @Audit @Validate List<ProjectResult> results);
2926

3027
}

‎service/src/main/java/com/appirio/service/review/manager/PeerReviewManager.java‎

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

3-
import java.math.BigDecimal;
4-
import java.text.SimpleDateFormat;
5-
import java.util.Date;
6-
import java.util.List;
7-
import java.util.Map;
8-
9-
import org.skife.jdbi.v2.Handle;
10-
import org.slf4j.Logger;
11-
import org.slf4j.LoggerFactory;
12-
133
import com.appirio.service.review.api.Member;
144
import com.appirio.service.review.api.Resource;
155
import com.appirio.service.review.api.ResourceInfo;
@@ -22,6 +12,15 @@
2212
import com.appirio.supply.Messages;
2313
import com.appirio.supply.SupplyException;
2414
import com.appirio.supply.dataaccess.db.IdGenerator;
15+
import org.skife.jdbi.v2.Handle;
16+
import org.slf4j.Logger;
17+
import org.slf4j.LoggerFactory;
18+
19+
import java.math.BigDecimal;
20+
import java.text.SimpleDateFormat;
21+
import java.util.Date;
22+
import java.util.List;
23+
import java.util.Map;
2524

2625
/**
2726
* Business logic implementation for review process
@@ -61,7 +60,6 @@ public PeerReviewManager() {
6160
* @param challengeId id of the challenge
6261
* @param user user instance
6362
* @param resourceDAO DAO for resource
64-
* @param phaseDAO DAO for phase
6563
* @return id of resource
6664
* @throws SupplyException exception for the supply
6765
*/
@@ -165,7 +163,6 @@ public Long assignNextReview(Long userId, Long challengeId) throws SupplyExcepti
165163
* @param reviewDAO DAO for review
166164
* @param scorecardDAO DAO for scorecard
167165
* @param resourceDAO DAO for resource
168-
* @param phaseDAO DAO for phase
169166
* @return id of the resource
170167
* @throws SupplyException exception for the supply
171168
* In case the user is not allowed to review this challenge

0 commit comments

Comments
 (0)