Skip to content

Commit 697f8ef

Browse files
committed
Added 'options' property to SearchRequest and updated the Java client
1 parent cd4d35e commit 697f8ef

File tree

80 files changed

+333
-309
lines changed

Some content is hidden

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

80 files changed

+333
-309
lines changed

.github/workflows/maven.yml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
3+
#
4+
# This file is auto-generated by OpenAPI Generator (https://openapi-generator.tech)
5+
6+
name: Java CI with Maven
7+
8+
on:
9+
push:
10+
branches: [ main, master ]
11+
pull_request:
12+
branches: [ main, master ]
13+
14+
jobs:
15+
build:
16+
name: Build Manticore Search Client
17+
runs-on: ubuntu-latest
18+
strategy:
19+
matrix:
20+
java: [ '8' ]
21+
steps:
22+
- uses: actions/checkout@v2
23+
- name: Set up JDK
24+
uses: actions/setup-java@v2
25+
with:
26+
java-version: ${{ matrix.java }}
27+
distribution: 'temurin'
28+
cache: maven
29+
- name: Build with Maven
30+
run: mvn -B package --no-transfer-progress --file pom.xml

.gitignore

100644100755
File mode changed.

.openapi-generator-ignore

100644100755
File mode changed.

.travis.yml

100644100755
File mode changed.

build.gradle

100644100755
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'eclipse'
33
apply plugin: 'com.diffplug.spotless'
44

55
group = 'com.manticoresearch'
6-
version = '3.0.0'
6+
version = '3.1.0'
77

88
buildscript {
99
repositories {
@@ -33,8 +33,8 @@ if(hasProperty('target') && target == 'android') {
3333
targetSdkVersion 25
3434
}
3535
compileOptions {
36-
sourceCompatibility JavaVersion.VERSION_1_7
37-
targetCompatibility JavaVersion.VERSION_1_7
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
3838
}
3939

4040
// Rename the aar correctly
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
7878

7979
apply plugin: 'java'
8080
apply plugin: 'maven-publish'
81-
sourceCompatibility = JavaVersion.VERSION_1_7
82-
targetCompatibility = JavaVersion.VERSION_1_7
81+
sourceCompatibility = JavaVersion.VERSION_1_8
82+
targetCompatibility = JavaVersion.VERSION_1_8
8383

8484
publishing {
8585
publications {
@@ -105,7 +105,6 @@ ext {
105105
jakarta_annotation_version = "1.3.5"
106106
jersey_version = "2.35"
107107
junit_version = "4.13.2"
108-
threetenbp_version = "2.9.10"
109108
}
110109

111110
dependencies {
@@ -120,8 +119,7 @@ dependencies {
120119
implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
121120
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
122121
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
123-
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
124-
implementation "com.brsanthu:migbase64:2.2"
122+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
125123
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
126124
testImplementation "junit:junit:$junit_version"
127125
}

build.sbt

100644100755
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ lazy val root = (project in file(".")).
22
settings(
33
organization := "com.manticoresearch",
44
name := "manticoresearch",
5-
version := "3.0.0",
5+
version := "3.1.0",
66
scalaVersion := "2.11.4",
77
scalacOptions ++= Seq("-feature"),
88
Compile / javacOptions ++= Seq("-Xlint:deprecation"),
@@ -19,9 +19,8 @@ lazy val root = (project in file(".")).
1919
"com.fasterxml.jackson.core" % "jackson-core" % "2.13.0" % "compile",
2020
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.13.0" % "compile",
2121
"com.fasterxml.jackson.core" % "jackson-databind" % "2.13.0" % "compile",
22-
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.12.5" % "compile",
22+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.13.0" % "compile",
2323
"org.openapitools" % "jackson-databind-nullable" % "0.2.2" % "compile",
24-
"com.brsanthu" % "migbase64" % "2.2",
2524
"jakarta.annotation" % "jakarta.annotation-api" % "1.3.5" % "compile",
2625
"junit" % "junit" % "4.13.2" % "test",
2726
"com.novocode" % "junit-interface" % "0.10" % "test"

docs/BulkResponse.md

100644100755
File mode changed.

docs/DeleteDocumentRequest.md

100644100755
File mode changed.

docs/DeleteResponse.md

100644100755
File mode changed.

docs/ErrorResponse.md

100644100755
File mode changed.

0 commit comments

Comments
 (0)