Skip to content

Commit

Permalink
feat: resolve conflicts and merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxenceMaire committed Dec 16, 2021
2 parents 12922c4 + 1bb1322 commit 9aeaf58
Show file tree
Hide file tree
Showing 238 changed files with 35,194 additions and 145 deletions.
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ module.exports = {
// there's a conflict when declaring `type` and `namespaces`, even with `ignoreDeclarationMerge`
'no-redeclare': 0,
'@typescript-eslint/no-redeclare': 0,
// Some endpoints have A LOT of parameters
'max-params': 0,

'@typescript-eslint/no-unused-vars': 2,
'unused-imports/no-unused-imports-ts': 2,
Expand Down
6 changes: 6 additions & 0 deletions .github/actions/cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,9 @@ runs:
with:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}

- name: Restore maven dependencies.
uses: actions/cache@v2
with:
path: '~/.m2/repository'
key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
26 changes: 25 additions & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ jobs:
- name: Checking personalization specs
run: yarn specs personalization

- name: Checking analytics specs
run: yarn specs analytics

- name: Lint
run: yamllint specs

Expand Down Expand Up @@ -59,12 +62,33 @@ jobs:
- name: Build personalization client
run: yarn client:build-js:personalization

- name: Generate analytics client
run: yarn generate javascript analytics

- name: Build analytics client
run: yarn client:build-js:analytics

- name: Lint
run: yarn lint

client_java:
runs-on: ubuntu-20.04
needs: [setup, specs]
steps:
- uses: actions/checkout@v2

- name: Restore cache
uses: ./.github/actions/cache

- name: Generate search client
run: yarn generate java search

- name: Build search client
run: yarn client:build-java

cts:
runs-on: ubuntu-20.04
needs: [setup, specs, client_javascript]
needs: [setup, specs, client_javascript, client_java]
steps:
- uses: actions/checkout@v2

Expand Down
7 changes: 4 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ yarn-error.log
!.yarn/releases
!.yarn/plugins

**/node_modules
**/dist
.vscode/
.idea/

.vscode
target
**/.DS_Store
20 changes: 20 additions & 0 deletions clients/algoliasearch-client-java-2/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
*.class

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# build files
**/target
target
.gradle
build

.openapi-generator
21 changes: 21 additions & 0 deletions clients/algoliasearch-client-java-2/.openapi-generator-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# OpenAPI Generator Ignore
# Generated by openapi-generator https://github.com/openapitools/openapi-generator

# Use this file to prevent files from being overwritten by the generator.
# The patterns follow closely to .gitignore or .dockerignore.

api/**
docs/**
gradle/**
src/**

.travis.yml
build.gradle
build.sbt
git_push.sh
gradle*
settings.gradle

# Selective source file
algoliasearch-core/com/algolia/auth/**
algoliasearch-core/com/algolia/Configuration.java
68 changes: 68 additions & 0 deletions clients/algoliasearch-client-java-2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
# algoliasearch-client-java-2

Search API
- API version: 0.1.0

API powering the Search feature of Algolia.

*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*

## Requirements

Building the API client library requires:
1. Java 1.8+
2. Maven/Gradle

## Installation

To install the API client library to your local Maven repository, simply execute:

```shell
mvn clean install
```

To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:

```shell
mvn clean deploy
```

Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.

### Maven users

Add this dependency to your project's POM:

```xml
<dependency>
<groupId>com.algolia</groupId>
<artifactId>algoliasearch-client-java-2</artifactId>
<version>0.1.0</version>
<scope>compile</scope>
</dependency>
```

### Gradle users

Add this dependency to your project's build file:

```groovy
compile "com.algolia:algoliasearch-client-java-2:0.1.0"
```

### Others

At first generate the JAR by executing:

```shell
mvn clean package
```

Then manually install the following JARs:

* `target/algoliasearch-client-java-2-0.1.0.jar`
* `target/lib/*.jar`

## Getting Started

Checkout the playground.
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
package com.algolia;

import java.io.IOException;
import java.util.List;
import java.util.Map;

/**
* Callback for asynchronous API call.
*
* @param <T> The return type
*/
public interface ApiCallback<T> {
/**
* This is called when the API call fails.
*
* @param e The exception causing the failure
* @param statusCode Status code of the response if available, otherwise it would be 0
* @param responseHeaders Headers of the response if available, otherwise it would be null
*/
void onFailure(
ApiException e,
int statusCode,
Map<String, List<String>> responseHeaders
);

/**
* This is called when the API call succeeded.
*
* @param result The result deserialized from response
* @param statusCode Status code of the response
* @param responseHeaders Headers of the response
*/
void onSuccess(
T result,
int statusCode,
Map<String, List<String>> responseHeaders
);

/**
* This is called when the API upload processing.
*
* @param bytesWritten bytes Written
* @param contentLength content length of request body
* @param done write end
*/
void onUploadProgress(long bytesWritten, long contentLength, boolean done);

/**
* This is called when the API download processing.
*
* @param bytesRead bytes Read
* @param contentLength content length of the response
* @param done Read end
*/
void onDownloadProgress(long bytesRead, long contentLength, boolean done);
}
Loading

0 comments on commit 9aeaf58

Please sign in to comment.