Skip to content

Merge release to master #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrecharla merged 12 commits into from
Apr 15, 2016
Merged

Merge release to master #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4aa4c2f
Generate Kafka event for Peer review #98383861382799
Mar 28, 2016
402258c
Generate Kafka event for Peer review #98383861382799
Mar 29, 2016
d4da53b
Remove unnecessary comments #98383861382799
Mar 29, 2016
65a2dc1
Merge pull request #37 from appirio-tech/kafka
rrecharla Mar 29, 2016
6657b6d
Bump up the supply library version #98383861382799
Apr 7, 2016
46d79f4
Add dependency to 1.0.7-SNAPSHOT
Apr 7, 2016
727eae2
Merge branch 'dev' of https://github.com/appirio-tech/ap-review-micro…
Apr 7, 2016
8074535
Add jackson 2.5.1
Apr 7, 2016
6f07cd6
Use jackson-version 2.5.1 and above
Apr 8, 2016
6212d74
Add other jackson dependencies
Apr 8, 2016
fdaabca
Add jackson dependencies to review
Apr 8, 2016
4c4603a
Merge branch 'dev' of https://github.com/appirio-tech/ap-review-micro…
Apr 8, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<properties>
<dropwizard.version>0.7.1</dropwizard.version>
<powermock.version>1.5.4</powermock.version>
<jackson-version>[2.5.1,)</jackson-version>
</properties>

<build>
Expand Down Expand Up @@ -123,7 +124,7 @@
<dependency>
<groupId>appirio.platform</groupId>
<artifactId>supply-library</artifactId>
<version>1.0.3</version>
<version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -183,6 +184,55 @@
<artifactId>com.springsource.com.informix.jdbc</artifactId>
<version>3.0.0.JC3</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.appirio</groupId>
<artifactId>ap-events-bus</artifactId>
<version>0.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<distributionManagement>
<!-- for deployment on the build server -->
Expand Down
34 changes: 33 additions & 1 deletion service/run-config/dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<properties>
<dropwizard.version>0.7.1</dropwizard.version>
<newrelic.version>3.20.0</newrelic.version>
<jackson-version>[2.5.1,)</jackson-version>
</properties>
<build>
<plugins>
Expand All @@ -26,6 +27,7 @@
<exclude>**/*Test*.class</exclude>
</excludes>
</instrumentation>
<check/>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -107,10 +109,40 @@
<artifactId>dropwizard-jobs-core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
<artifactId>supply-library</artifactId>
<version>1.0.3-SNAPSHOT</version>
<version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
Expand Down
34 changes: 33 additions & 1 deletion service/run-config/prod/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<properties>
<dropwizard.version>0.7.1</dropwizard.version>
<newrelic.version>3.20.0</newrelic.version>
<jackson-version>[2.5.1,)</jackson-version>
</properties>
<build>
<plugins>
Expand All @@ -26,6 +27,7 @@
<exclude>**/*Test*.class</exclude>
</excludes>
</instrumentation>
<check/>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -107,10 +109,40 @@
<artifactId>dropwizard-jobs-core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
<artifactId>supply-library</artifactId>
<version>1.0.3</version>
<version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
Expand Down
34 changes: 33 additions & 1 deletion service/run-config/qa/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<properties>
<dropwizard.version>0.7.1</dropwizard.version>
<newrelic.version>3.20.0</newrelic.version>
<jackson-version>[2.5.1,)</jackson-version>
</properties>
<build>
<plugins>
Expand All @@ -26,6 +27,7 @@
<exclude>**/*Test*.class</exclude>
</excludes>
</instrumentation>
<check/>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -107,10 +109,40 @@
<artifactId>dropwizard-jobs-core</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-jaxb-annotations</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson-version}</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
<artifactId>supply-library</artifactId>
<version>1.0.3</version>
<version>1.0.7-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>appirio.platform</groupId>
Expand Down
11 changes: 4 additions & 7 deletions service/src/main/java/com/appirio/service/review/dao/ProjectResultDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package com.appirio.service.review.dao;

import java.util.List;

import org.skife.jdbi.v2.sqlobject.BindBean;

import com.appirio.service.review.api.ProjectResult;
import com.appirio.supply.dataaccess.DatasourceName;
import com.appirio.supply.dataaccess.SqlBatchFile;
import com.appirio.supply.dataaccess.api.audit.Audit;
import com.appirio.supply.dataaccess.api.audit.AuditActionPerformer;
import com.appirio.supply.dataaccess.api.validation.Validate;
import org.skife.jdbi.v2.sqlobject.BindBean;

import java.util.List;

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

}
21 changes: 9 additions & 12 deletions service/src/main/java/com/appirio/service/review/manager/PeerReviewManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
package com.appirio.service.review.manager;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

import org.skife.jdbi.v2.Handle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import com.appirio.service.review.api.Member;
import com.appirio.service.review.api.Resource;
import com.appirio.service.review.api.ResourceInfo;
Expand All @@ -22,6 +12,15 @@
import com.appirio.supply.Messages;
import com.appirio.supply.SupplyException;
import com.appirio.supply.dataaccess.db.IdGenerator;
import org.skife.jdbi.v2.Handle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
* Business logic implementation for review process
Expand Down Expand Up @@ -61,7 +60,6 @@ public PeerReviewManager() {
* @param challengeId id of the challenge
* @param user user instance
* @param resourceDAO DAO for resource
* @param phaseDAO DAO for phase
* @return id of resource
* @throws SupplyException exception for the supply
*/
Expand Down Expand Up @@ -165,7 +163,6 @@ public Long assignNextReview(Long userId, Long challengeId) throws SupplyExcepti
* @param reviewDAO DAO for review
* @param scorecardDAO DAO for scorecard
* @param resourceDAO DAO for resource
* @param phaseDAO DAO for phase
* @return id of the resource
* @throws SupplyException exception for the supply
* In case the user is not allowed to review this challenge
Expand Down
Loading