Skip to content

dbeaver/pro#3087 couchdb gson bug #83

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

Open
serge-rider wants to merge 8 commits into
base: master
Choose a base branch
from
Open

dbeaver/pro#3087 couchdb gson bug #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b0452b
Fix of #73 (DbInfo mapping)
serge-rider Jul 31, 2020
0c4dc35
Merge pull request #1 from dbeaver-corp/cdb23fix
serge-rider Jul 31, 2020
95fe579
Switch to Java1.6 compile target
serge-rider Jul 31, 2020
1e7143d
dbeaver/dbeaver-ee#1931 update vulnerable dependencies
flambchap Sep 6, 2022
efc7197
dbeaver/dbeaver-ee#1931 disable "unit tests" that run against a live …
flambchap Sep 9, 2022
b23ac20
dbeaver/dbeaver-ee#1931 refactor URIBuilder: fixes issues with improp…
flambchap Sep 10, 2022
f4b67e6
Merge pull request #2 from dbeaver/dbeaver/dbeaver-ee#1931
serge-rider Sep 12, 2022
0ac468d
dbeaver/pro#3087 Fix GSon type adapters
serge-rider Oct 3, 2024
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
20 changes: 14 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>org.lightcouch</groupId>
<artifactId>lightcouch</artifactId>
<version>0.2.1-SNAPSHOT</version>
<version>0.2.4</version>
<packaging>jar</packaging>
<name>LightCouch</name>
<description>CouchDB Java API</description>
Expand Down Expand Up @@ -35,9 +35,10 @@
</developers>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<httpclient.version>4.5.3</httpclient.version>
<gson.version>2.8.2</gson.version>
<junit.version>4.8.2</junit.version>
<httpclient.version>4.5.13</httpclient.version>
<gson.version>2.11.0</gson.version>
<junit.version>4.13.2</junit.version>
<jb-annotations.version>23.0.0</jb-annotations.version>
</properties>
<dependencies>
<!-- Apache HttpComponents -->
Expand All @@ -59,6 +60,13 @@
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<!-- https://mvnrepository.com/artifact/org.jetbrains/annotations -->
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
<version>${jb-annotations.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -67,8 +75,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
<source>11</source>
<target>11</target>
</configuration>
</plugin>
</plugins>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/lightcouch/Changes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public class Changes {
Changes(CouchDbClientBase dbc) {
this.dbc = dbc;
this.gson = dbc.getGson();
this.uriBuilder = URIBuilder.buildUri(dbc.getDBUri()).path("_changes");
this.uriBuilder = dbc.getDBURIBuilder().pathSegment("_changes");
}

/**
Expand Down Expand Up @@ -152,7 +152,7 @@ public Changes filter(String filter) {
}

public Changes includeDocs(boolean includeDocs) {
uriBuilder.query("include_docs", includeDocs);
uriBuilder.query(CouchConstants.PARAM_INCLUDE_DOCS, includeDocs);
return this;
}

Expand Down
25 changes: 25 additions & 0 deletions src/main/java/org/lightcouch/CouchConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/*
* Copyright (C) 2011 lightcouch.org
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.lightcouch;

final class CouchConstants {
static final String PARAM_REVISION = "rev";
static final String PARAM_INCLUDE_DOCS = "include_docs";

private CouchConstants() {
// No instances for you!
}
}
Loading