Skip to content

Change MeiliSearchHttpRequest for MeilisearchHttpRequest #447

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.

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
merged 2 commits into from
Sep 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions src/main/java/com/meilisearch/sdk/Documents.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
import com.meilisearch.sdk.model.Task;
import java.util.List;

/** Wrapper around MeiliSearchHttpRequest class to use for Meilisearch documents */
/** Wrapper around MeilisearchHttpRequest class to use for Meilisearch documents */
class Documents {
private final MeiliSearchHttpRequest meilisearchHttpRequest;
private final MeilisearchHttpRequest meilisearchHttpRequest;

protected Documents(Config config) {
meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/meilisearch/sdk/Index.java
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@ public void waitForTask(int taskId, int timeoutInMs, int intervalInMs)
*/
public void fetchPrimaryKey() throws MeilisearchException {
String requestQuery = "/indexes/" + this.uid;
MeiliSearchHttpRequest meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
MeilisearchHttpRequest meilisearchHttpRequest = new MeilisearchHttpRequest(config);
Index retrievedIndex =
config.jsonHandler.decode(meilisearchHttpRequest.get(requestQuery), Index.class);
this.primaryKey = retrievedIndex.getPrimaryKey();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meilisearch/sdk/IndexesHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

/** Wrapper around the MeiliSearchHttpRequest class to ease usage for Meilisearch indexes */
class IndexesHandler {
MeiliSearchHttpRequest meilisearchHttpRequest;
MeilisearchHttpRequest meilisearchHttpRequest;

/**
* Creates and sets up an instance of IndexesHandler to simplify Meilisearch API calls to manage
Expand All @@ -14,7 +14,7 @@ class IndexesHandler {
* @param config Meilisearch configuration
*/
IndexesHandler(Config config) {
this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meilisearch/sdk/KeysHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
* <p>Refer https://docs.meilisearch.com/reference/api/keys.html
*/
public class KeysHandler {
private final MeiliSearchHttpRequest meilisearchHttpRequest;
private final MeilisearchHttpRequest meilisearchHttpRequest;

/**
* Creates and sets up an instance of Key to simplify Meilisearch API calls to manage keys
*
* @param config Meilisearch configuration
*/
public KeysHandler(Config config) {
this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,29 @@
import java.util.Collections;

/** The HTTP requests for the different functions to be done through Meilisearch */
public class MeiliSearchHttpRequest {
public class MeilisearchHttpRequest {
private final AbstractHttpClient client;
private final RequestFactory factory;
protected final JsonHandler jsonHandler;

/**
* Constructor for the MeiliSearchHttpRequest
* Constructor for the MeilisearchHttpRequest
*
* @param config Meilisearch configuration
*/
public MeiliSearchHttpRequest(Config config) {
public MeilisearchHttpRequest(Config config) {
this.client = new DefaultHttpClient(config);
this.jsonHandler = config.jsonHandler;
this.factory = new BasicRequestFactory(jsonHandler);
}

/**
* Constructor for the MeiliSearchHttpRequest
* Constructor for the MeilisearchHttpRequest
*
* @param client HttpClient for making calls to server
* @param factory RequestFactory for generating calls to server
*/
public MeiliSearchHttpRequest(AbstractHttpClient client, RequestFactory factory) {
public MeilisearchHttpRequest(AbstractHttpClient client, RequestFactory factory) {
this.client = client;
this.factory = factory;
this.jsonHandler = new GsonJsonHandler();
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meilisearch/sdk/Search.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@

/** Search Object for searching on indexes */
public class Search {
private final MeiliSearchHttpRequest meilisearchHttpRequest;
private final MeilisearchHttpRequest meilisearchHttpRequest;

/**
* Constructor for the Meilisearch Search object
*
* @param config Meilisearch configuration
*/
protected Search(Config config) {
meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meilisearch/sdk/SettingsHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
* <p>Refer https://docs.meilisearch.com/reference/api/settings.html
*/
public class SettingsHandler {
private final MeiliSearchHttpRequest meilisearchHttpRequest;
private final MeilisearchHttpRequest meilisearchHttpRequest;

/**
* Constructor for the Meilisearch Settings object
*
* @param config Meilisearch configuration
*/
public SettingsHandler(Config config) {
meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/meilisearch/sdk/TasksHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* <p>Refer https://docs.meilisearch.com/reference/api/tasks.html
*/
public class TasksHandler {
private final MeiliSearchHttpRequest meilisearchHttpRequest;
private final MeilisearchHttpRequest meilisearchHttpRequest;
public static final String SUCCEEDED = "succeeded";
public static final String FAILED = "failed";

Expand All @@ -22,7 +22,7 @@ public class TasksHandler {
* @param config MeiliSearch configuration
*/
public TasksHandler(Config config) {
this.meilisearchHttpRequest = new MeiliSearchHttpRequest(config);
this.meilisearchHttpRequest = new MeilisearchHttpRequest(config);
}

/**
Expand Down