Skip to content

Commit d62578d

Browse files
osoykanosoykan
committed
refactor: elasticsearchsystem does not depend on co.elastic client anymore
1 parent ac7074e commit d62578d

File tree

8 files changed

+430
-292
lines changed

8 files changed

+430
-292
lines changed

‎lib/stove-testing-e2e-elasticsearch/api/stove-testing-e2e-elasticsearch.api‎

Lines changed: 56 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,3 @@
1-
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer {
2-
public fun <init> ()V
3-
public fun <init> (Lkotlin/jvm/functions/Function1;Larrow/core/Option;)V
4-
public synthetic fun <init> (Lkotlin/jvm/functions/Function1;Larrow/core/Option;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
5-
public final fun component1 ()Lkotlin/jvm/functions/Function1;
6-
public final fun component2 ()Larrow/core/Option;
7-
public final fun copy (Lkotlin/jvm/functions/Function1;Larrow/core/Option;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;
8-
public static synthetic fun copy$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lkotlin/jvm/functions/Function1;Larrow/core/Option;ILjava/lang/Object;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;
9-
public fun equals (Ljava/lang/Object;)Z
10-
public final fun getHttpClientBuilder ()Lkotlin/jvm/functions/Function1;
11-
public final fun getRestClientOverrideFn ()Larrow/core/Option;
12-
public fun hashCode ()I
13-
public fun toString ()Ljava/lang/String;
14-
}
15-
161
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions : com/trendyol/stove/testing/e2e/containers/ContainerOptions {
172
public static final field Companion Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions$Companion;
183
public static final field DEFAULT_ELASTIC_PORT I
@@ -52,19 +37,20 @@ public abstract interface annotation class com/trendyol/stove/testing/e2e/elasti
5237
}
5338

5439
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration : com/trendyol/stove/testing/e2e/system/abstractions/ExposedConfiguration {
55-
public fun <init> (Ljava/lang/String;ILjava/lang/String;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;)V
40+
public fun <init> (Ljava/lang/String;ILjava/lang/String;Z)V
41+
public synthetic fun <init> (Ljava/lang/String;ILjava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
5642
public final fun component1 ()Ljava/lang/String;
5743
public final fun component2 ()I
5844
public final fun component3 ()Ljava/lang/String;
59-
public final fun component4 ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;
60-
public final fun copy (Ljava/lang/String;ILjava/lang/String;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
61-
public static synthetic fun copy$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Ljava/lang/String;ILjava/lang/String;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;ILjava/lang/Object;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
45+
public final fun component4 ()Z
46+
public final fun copy (Ljava/lang/String;ILjava/lang/String;Z)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
47+
public static synthetic fun copy$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Ljava/lang/String;ILjava/lang/String;ZILjava/lang/Object;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
6248
public fun equals (Ljava/lang/Object;)Z
63-
public final fun getCertificate ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;
6449
public final fun getHost ()Ljava/lang/String;
6550
public final fun getPassword ()Ljava/lang/String;
6651
public final fun getPort ()I
6752
public fun hashCode ()I
53+
public final fun isSecure ()Z
6854
public fun toString ()Ljava/lang/String;
6955
}
7056

@@ -101,45 +87,80 @@ public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExp
10187

10288
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem : com/trendyol/stove/testing/e2e/system/abstractions/AfterRunAware, com/trendyol/stove/testing/e2e/system/abstractions/ExposesConfiguration, com/trendyol/stove/testing/e2e/system/abstractions/PluggedSystem, com/trendyol/stove/testing/e2e/system/abstractions/RunAware {
10389
public static final field Companion Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$Companion;
104-
public field esClient Lco/elastic/clients/elasticsearch/ElasticsearchClient;
90+
public field baseUrl Ljava/lang/String;
91+
public field httpClient Lio/ktor/client/HttpClient;
10592
public fun afterRun (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
10693
public fun close ()V
10794
public fun configuration ()Ljava/util/List;
95+
public final fun createIndex (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
96+
public static synthetic fun createIndex$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
97+
public final fun deleteIndex (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
98+
public final fun ensureSuccess (Lio/ktor/client/statement/HttpResponse;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
99+
public final fun ensureSuccessOrNotFound (Lio/ktor/client/statement/HttpResponse;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
108100
public fun executeWithReuseCheck (Lkotlin/jvm/functions/Function1;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
109-
public final fun getEsClient ()Lco/elastic/clients/elasticsearch/ElasticsearchClient;
101+
public final fun extractSearchHits (Lcom/fasterxml/jackson/databind/JsonNode;Ljava/lang/Class;)Ljava/util/List;
102+
public final fun extractSource (Lcom/fasterxml/jackson/databind/JsonNode;Ljava/lang/Class;)Ljava/lang/Object;
103+
public final fun getBaseUrl ()Ljava/lang/String;
104+
public final fun getHttpClient ()Lio/ktor/client/HttpClient;
105+
public final fun getObjectMapper ()Lcom/fasterxml/jackson/databind/ObjectMapper;
110106
public fun getTestSystem ()Lcom/trendyol/stove/testing/e2e/system/TestSystem;
107+
public final fun indexExists (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
111108
public final fun pause ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;
109+
public final fun refreshIndex (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
110+
public final fun requireValidIndex (Ljava/lang/String;)V
111+
public final fun requireValidKey (Ljava/lang/String;)V
112112
public fun run (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
113-
public final fun save (Ljava/lang/String;Ljava/lang/Object;Ljava/lang/String;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;
114-
public final fun setEsClient (Lco/elastic/clients/elasticsearch/ElasticsearchClient;)V
115-
public final fun shouldDelete (Ljava/lang/String;Ljava/lang/String;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;
116-
public final fun shouldNotExist (Ljava/lang/String;Ljava/lang/String;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;
113+
public final fun setBaseUrl (Ljava/lang/String;)V
114+
public final fun setHttpClient (Lio/ktor/client/HttpClient;)V
115+
public final fun shouldDelete (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
116+
public final fun shouldNotExist (Ljava/lang/String;Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
117117
public fun stop (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
118118
public fun then ()Lcom/trendyol/stove/testing/e2e/system/TestSystem;
119119
public final fun unpause ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;
120120
}
121121

122122
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$Companion {
123-
public final fun client (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;)Lco/elastic/clients/elasticsearch/ElasticsearchClient;
123+
public final fun baseUrl (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;)Ljava/lang/String;
124+
public final fun client (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem;)Lio/ktor/client/HttpClient;
125+
}
126+
127+
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$Endpoint {
128+
public static final field INSTANCE Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$Endpoint;
129+
public final fun document (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
130+
public final fun index (Ljava/lang/String;)Ljava/lang/String;
131+
public final fun refresh (Ljava/lang/String;)Ljava/lang/String;
132+
public final fun search (Ljava/lang/String;)Ljava/lang/String;
133+
}
134+
135+
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$QueryParam {
136+
public static final field INSTANCE Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$QueryParam;
137+
public static final field REFRESH Ljava/lang/String;
138+
public static final field WAIT_FOR Ljava/lang/String;
139+
}
140+
141+
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$ResponseField {
142+
public static final field HITS Ljava/lang/String;
143+
public static final field INSTANCE Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystem$ResponseField;
144+
public static final field SOURCE Ljava/lang/String;
124145
}
125146

126147
public class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions : com/trendyol/stove/testing/e2e/database/migrations/SupportsMigrations, com/trendyol/stove/testing/e2e/system/abstractions/ConfiguresExposedConfiguration, com/trendyol/stove/testing/e2e/system/abstractions/SystemOptions {
127148
public static final field Companion Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions$Companion;
128-
public fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions;Lco/elastic/clients/json/JsonpMapper;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
129-
public synthetic fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions;Lco/elastic/clients/json/JsonpMapper;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
149+
public fun <init> (Larrow/core/Option;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions;Lcom/fasterxml/jackson/databind/ObjectMapper;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)V
150+
public synthetic fun <init> (Larrow/core/Option;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions;Lcom/fasterxml/jackson/databind/ObjectMapper;Lkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
130151
public fun getCleanup ()Lkotlin/jvm/functions/Function2;
131-
public fun getClientConfigurer ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;
132152
public fun getConfigureExposedConfiguration ()Lkotlin/jvm/functions/Function1;
133153
public fun getContainer ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticContainerOptions;
134-
public fun getJsonpMapper ()Lco/elastic/clients/json/JsonpMapper;
154+
public fun getHttpClientConfigurer ()Larrow/core/Option;
135155
public fun getMigrationCollection ()Lcom/trendyol/stove/testing/e2e/database/migrations/MigrationCollection;
156+
public fun getObjectMapper ()Lcom/fasterxml/jackson/databind/ObjectMapper;
136157
public synthetic fun migrations (Lkotlin/jvm/functions/Function1;)Lcom/trendyol/stove/testing/e2e/database/migrations/SupportsMigrations;
137158
public fun migrations (Lkotlin/jvm/functions/Function1;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions;
138159
}
139160

140161
public final class com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions$Companion {
141-
public final fun provided (Ljava/lang/String;ILjava/lang/String;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lco/elastic/clients/json/JsonpMapper;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ProvidedElasticsearchSystemOptions;
142-
public static synthetic fun provided$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions$Companion;Ljava/lang/String;ILjava/lang/String;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchExposedCertificate;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lco/elastic/clients/json/JsonpMapper;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ProvidedElasticsearchSystemOptions;
162+
public final fun provided (Ljava/lang/String;ILjava/lang/String;ZLarrow/core/Option;Lcom/fasterxml/jackson/databind/ObjectMapper;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ProvidedElasticsearchSystemOptions;
163+
public static synthetic fun provided$default (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions$Companion;Ljava/lang/String;ILjava/lang/String;ZLarrow/core/Option;Lcom/fasterxml/jackson/databind/ObjectMapper;ZLkotlin/jvm/functions/Function2;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/trendyol/stove/testing/e2e/elasticsearch/ProvidedElasticsearchSystemOptions;
143164
}
144165

145166
public final class com/trendyol/stove/testing/e2e/elasticsearch/ExtensionsKt {
@@ -148,8 +169,8 @@ public final class com/trendyol/stove/testing/e2e/elasticsearch/ExtensionsKt {
148169
}
149170

150171
public final class com/trendyol/stove/testing/e2e/elasticsearch/ProvidedElasticsearchSystemOptions : com/trendyol/stove/testing/e2e/elasticsearch/ElasticsearchSystemOptions, com/trendyol/stove/testing/e2e/system/abstractions/ProvidedSystemOptions {
151-
public fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lco/elastic/clients/json/JsonpMapper;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function1;)V
152-
public synthetic fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticClientConfigurer;Lco/elastic/clients/json/JsonpMapper;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
172+
public fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Larrow/core/Option;Lcom/fasterxml/jackson/databind/ObjectMapper;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function1;)V
173+
public synthetic fun <init> (Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;Larrow/core/Option;Lcom/fasterxml/jackson/databind/ObjectMapper;Lkotlin/jvm/functions/Function2;ZLkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
153174
public final fun getConfig ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
154175
public fun getProvidedConfig ()Lcom/trendyol/stove/testing/e2e/elasticsearch/ElasticSearchExposedConfiguration;
155176
public synthetic fun getProvidedConfig ()Lcom/trendyol/stove/testing/e2e/system/abstractions/ExposedConfiguration;

‎lib/stove-testing-e2e-elasticsearch/build.gradle.kts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@ plugins {}
22

33
dependencies {
44
api(projects.lib.stoveTestingE2e)
5-
api(libs.elastic)
65
api(libs.testcontainers.elasticsearch)
6+
api(libs.ktor.client.core)
7+
api(libs.ktor.client.okhttp)
8+
api(libs.ktor.client.content.negotiation)
9+
api(libs.ktor.serialization.jackson.json)
710
implementation(libs.jackson.databind)
811
}
912

0 commit comments

Comments
 (0)