Skip to content
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

Bug fix reduce false when include docs true rebase #303

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Bug fix reduce false when include docs true rebase #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83c4861
bug fixed reduce false when includeDoc true and updated.
Apr 7, 2017
227a20f
Updated ektorp version to 1.5.1-RC1
Feb 22, 2020
8768350
Update distribution repo to nexus3
Feb 22, 2020
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
4 changes: 2 additions & 2 deletions org.ektorp.android/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<artifactId>org.ektorp.android</artifactId>
<packaging>jar</packaging>
<name>Ektorp Android</name>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
<description>Provides Android support to Ektorp</description>
<parent>
<groupId>org.ektorp</groupId>
<artifactId>org.ektorp.parent</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
</parent>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions org.ektorp.spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<artifactId>org.ektorp.spring</artifactId>
<packaging>jar</packaging>
<name>Ektorp Spring</name>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
<description>Provides Spring support to Ektorp</description>
<parent>
<groupId>org.ektorp</groupId>
<artifactId>org.ektorp.parent</artifactId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
</parent>

<dependencies>
Expand Down
15 changes: 13 additions & 2 deletions org.ektorp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
<artifactId>org.ektorp</artifactId>
<packaging>jar</packaging>
<name>Ektorp</name>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
<description>a Java CouchDB persistence library</description>
<parent>
<artifactId>org.ektorp.parent</artifactId>
<groupId>org.ektorp</groupId>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
</parent>

<dependencies>
Expand Down Expand Up @@ -93,4 +93,15 @@
<artifactId>jackson-databind</artifactId>
</dependency>
</dependencies>

<distributionManagement>
<repository>
<id>nexus-releases</id>
<url>http://nexus.dream-world.in/content/repositories/releases</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<url>http://nexus.dream-world.in/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
</project>
4 changes: 4 additions & 0 deletions org.ektorp/src/main/java/org/ektorp/support/CouchDbRepositorySupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ protected ViewQuery createQuery(String viewName) {
*/
protected List<T> queryView(String viewName, String key) {
return db.queryView(createQuery(viewName)
.reduce(false)
.includeDocs(true)
.key(key),
type);
Expand All @@ -224,6 +225,7 @@ protected List<T> queryView(String viewName, String key) {
*/
protected List<T> queryView(String viewName, int key) {
return db.queryView(createQuery(viewName)
.reduce(false)
.includeDocs(true)
.key(key),
type);
Expand All @@ -240,6 +242,7 @@ protected List<T> queryView(String viewName, int key) {
*/
protected List<T> queryView(String viewName, ComplexKey key) {
return db.queryView(createQuery(viewName)
.reduce(false)
.includeDocs(true)
.key(key),
type);
Expand All @@ -254,6 +257,7 @@ protected List<T> queryView(String viewName, ComplexKey key) {
*/
protected List<T> queryView(String viewName) {
return db.queryView(createQuery(viewName)
.reduce(false)
.includeDocs(true),
type);
}
Expand Down
1 change: 1 addition & 0 deletions org.ektorp/src/test/java/org/ektorp/support/CouchDbRepositorySupportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ public void given_that_all_view_exists_when_calling_getAll_then_it_should_be_que
.dbPath("test")
.designDocId("_design/TestDoc")
.includeDocs(true)
.reduce(false)
.viewName("all");

ViewQuery created = ac.getValue();
Expand Down
100 changes: 49 additions & 51 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<artifactId>org.ektorp.parent</artifactId>
<packaging>pom</packaging>
<name>Ektorp Parent</name>
<version>1.5.1-SNAPSHOT</version>
<version>1.5.1-RC1</version>
<description>a Java CouchDB persistence library</description>
<scm>
<connection>scm:git:[email protected]:helun/Ektorp.git</connection>
Expand Down Expand Up @@ -56,7 +56,7 @@
<mockito.version>1.8.5</mockito.version>
<junit.version>4.8.2</junit.version>
<joda.time.version>2.3</joda.time.version>
<jackson.version>2.6.7</jackson.version>
<jackson.version>2.10.2</jackson.version>
<spring.version>3.1.1.RELEASE</spring.version>
<commons.io.version>2.0.1</commons.io.version>
<httpclient.version>4.3</httpclient.version>
Expand Down Expand Up @@ -168,8 +168,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.4</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.8</source>
<target>1.8</target>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
Expand Down Expand Up @@ -214,42 +214,42 @@
</execution>
</executions>
</plugin>
<plugin>
<!-- http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html -->
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.4</version>
<configuration>
<additionalparam>${javadoc.opts}</additionalparam>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<configuration>
<skip>${findbugs.skip}</skip>
<fork>true</fork>
<includeTests>${findbugs.includeTests}</includeTests>
</configuration>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
<configuration>
<skip>false</skip>
</configuration>
</execution>
</executions>
</plugin>
<!-- <plugin> -->
<!-- http://blog.joda.org/2014/02/turning-off-doclint-in-jdk-8-javadoc.html -->
<!-- <artifactId>maven-javadoc-plugin</artifactId> -->
<!-- <version>2.10.4</version> -->
<!-- <configuration> -->
<!-- <additionalparam>${javadoc.opts}</additionalparam> -->
<!-- </configuration> -->
<!-- <executions> -->
<!-- <execution> -->
<!-- <id>attach-javadocs</id> -->
<!-- <goals> -->
<!-- <goal>jar</goal> -->
<!-- </goals> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->
<!-- <plugin> -->
<!-- <groupId>org.codehaus.mojo</groupId> -->
<!-- <artifactId>findbugs-maven-plugin</artifactId> -->
<!-- <configuration> -->
<!-- <skip>${findbugs.skip}</skip> -->
<!-- <fork>true</fork> -->
<!-- <includeTests>${findbugs.includeTests}</includeTests> -->
<!-- </configuration> -->
<!-- <executions> -->
<!-- <execution> -->
<!-- <phase>verify</phase> -->
<!-- <goals> -->
<!-- <goal>check</goal> -->
<!-- </goals> -->
<!-- <configuration> -->
<!-- <skip>false</skip> -->
<!-- </configuration> -->
<!-- </execution> -->
<!-- </executions> -->
<!-- </plugin> -->
</plugins>
<resources>
<resource>
Expand All @@ -269,17 +269,15 @@
</testResources>
</build>
<distributionManagement>
<snapshotRepository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>sonatype-nexus-staging</id>
<name>Nexus Release Repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
</repository>
</distributionManagement>
<repository>
<id>nexus-releases</id>
<url>http://nexus.dream-world.in/content/repositories/releases</url>
</repository>
<snapshotRepository>
<id>nexus-snapshots</id>
<url>http://nexus.dream-world.in/content/repositories/snapshots</url>
</snapshotRepository>
</distributionManagement>
<profiles>
<profile>
<id>release-sign-artifacts</id>
Expand Down