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

IVYPORTAL-17732 Change elastic search to open search #1105

Merged
merged 1 commit into from
Oct 2, 2024
Merged

IVYPORTAL-17732 Change elastic search to open search #1105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 19 additions & 12 deletions ...IvyPortal/PortalKitTestHelper/processes/Start Processes/CreateDataForComplexFilter.p.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,25 @@
"config" : {
"output" : {
"code" : [
"import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
"import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
"import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
"import ch.ivyteam.ivy.searchengine.ISearchEngineManager;",
"import ch.ivyteam.ivy.searchengine.client.IndexName;",
"import ch.ivyteam.ivy.searchengine.index.IndexInfo;",
"",
"//import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
"//import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
"//import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
"// via APi change that triggers the sync, e.g. CustomField",
"// also applies to tasks ",
"",
"//ivy.wf.findCase(in.caseID).customFields().stringField(\"ReindexTrigger\").set(\"1\");",
"",
"//Alternativ is via api with which to trigger reindexing. ",
"",
"for (int i = 0; i < IElasticsearchManager.instance().indicesCount(); i++) {",
"for (int i = 0; i < ISearchEngineManager.instance().indicesCount(); i++) {",
" ",
" IndexInfo indexInfo = IElasticsearchManager.instance().indices(0, 1000).get(i);",
" IndexInfo indexInfo = ISearchEngineManager.instance().indices(0, 1000).get(i);",
" ivy.log.info(\"Reindexing STARTED for: \" + indexInfo.indexName().toString());",
" IElasticsearchManager.instance().reindexSync(indexInfo.indexName());",
" ISearchEngineManager.instance().reindexSync(indexInfo.indexName());",
" ivy.log.info(\"Reindexing DONE for: \" + indexInfo.indexName().toString());",
" ",
"}",
Expand Down Expand Up @@ -1897,21 +1901,24 @@
"config" : {
"output" : {
"code" : [
"import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
"import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
"import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
"import ch.ivyteam.ivy.searchengine.ISearchEngineManager;",
"import ch.ivyteam.ivy.searchengine.client.IndexName;",
"import ch.ivyteam.ivy.searchengine.index.IndexInfo;",
"//import ch.ivyteam.ivy.elasticsearch.index.IndexInfo;",
"//import ch.ivyteam.ivy.elasticsearch.client.IndexName;",
"//import ch.ivyteam.ivy.elasticsearch.IElasticsearchManager;",
"// via APi change that triggers the sync, e.g. CustomField",
"// also applies to tasks ",
"",
"//ivy.wf.findCase(in.caseID).customFields().stringField(\"ReindexTrigger\").set(\"1\");",
"",
"//Alternativ is via api with which to trigger reindexing. ",
"",
"for (int i = 0; i < IElasticsearchManager.instance().indicesCount(); i++) {",
"for (int i = 0; i < ISearchEngineManager.instance().indicesCount(); i++) {",
" ",
" IndexInfo indexInfo = IElasticsearchManager.instance().indices(0, 1000).get(i);",
" IndexInfo indexInfo = ISearchEngineManager.instance().indices(0, 1000).get(i);",
" ivy.log.info(\"Reindexing STARTED for: \" + indexInfo.indexName().toString());",
" IElasticsearchManager.instance().reindexSync(indexInfo.indexName());",
" ISearchEngineManager.instance().reindexSync(indexInfo.indexName());",
" ivy.log.info(\"Reindexing DONE for: \" + indexInfo.indexName().toString());",
" ",
"}",
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/statistics/ClientStatisticResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.axonivy.portal.bo.ClientStatistic;

import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;

public class ClientStatisticResponse {
private AggregationResult result;
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/src/com/axonivy/portal/rest/ClientStatisticRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.axonivy.portal.service.ClientStatisticService;

import ch.ivy.addon.portalkit.statistics.ClientStatisticResponse;
import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;
import ch.ivyteam.ivy.security.ISecurityConstants;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
2 changes: 1 addition & 1 deletion AxonIvyPortal/portal/src/com/axonivy/portal/service/ClientStatisticService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import ch.ivy.addon.portalkit.enums.PortalVariable;
import ch.ivy.addon.portalkit.service.JsonConfigurationService;
import ch.ivy.addon.portalkit.statistics.ClientStatisticResponse;
import ch.ivyteam.ivy.elasticsearch.client.agg.AggregationResult;
import ch.ivyteam.ivy.environment.Ivy;
import ch.ivyteam.ivy.searchengine.client.agg.AggregationResult;
import ch.ivyteam.ivy.workflow.stats.WorkflowStats;

public class ClientStatisticService extends JsonConfigurationService<ClientStatistic> {
Expand Down
Loading