Skip to content

Commit c9c39e3

Browse files
marko-bekhtamarko-bekhta
committed
HSEARCH-798 Update/squash categories, improve the report, etc.
1 parent 814544b commit c9c39e3

File tree

157 files changed

+622
-880
lines changed

Some content is hidden

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

157 files changed

+622
-880
lines changed

‎backend/elasticsearch-aws/src/main/java/org/hibernate/search/backend/elasticsearch/aws/logging/impl/AwsLog.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@
3232
@CategorizedLogger(
3333
category = AwsLog.CATEGORY_NAME,
3434
description = """
35-
Provides trace/debug level logs on signing requests sent to an AWS Elasticsearch cluster.
36-
+
37-
Let the user know whether the request signing is enabled or disabled.
38-
+
39-
Can log the request before and after signing to help debug any issues with AWS Elasticsearch cluster communication.
35+
Logs related to the AWS integration of the Elasticsearch backend.
4036
"""
4137
)
4238
@MessageLogger(projectCode = MessageConstants.PROJECT_CODE)
@@ -46,7 +42,7 @@
4642
})
4743
public interface AwsLog extends BasicLogger {
4844

49-
String CATEGORY_NAME = "org.hibernate.search.backend.elasticsearch.aws";
45+
String CATEGORY_NAME = "org.hibernate.search.elasticsearch.aws";
5046

5147
AwsLog INSTANCE = LoggerFactory.make( AwsLog.class, CATEGORY_NAME, MethodHandles.lookup() );
5248

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/ElasticsearchExtension.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import java.util.Optional;
88

9-
import org.hibernate.search.backend.elasticsearch.logging.impl.CommonFailureLog;
9+
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchMiscLog;
1010
import org.hibernate.search.backend.elasticsearch.schema.management.ElasticsearchIndexSchemaExport;
1111
import org.hibernate.search.backend.elasticsearch.search.aggregation.dsl.ElasticsearchSearchAggregationFactory;
1212
import org.hibernate.search.backend.elasticsearch.search.predicate.dsl.ElasticsearchSearchPredicateFactory;
@@ -194,7 +194,7 @@ public ElasticsearchIndexFieldTypeFactory extendOrFail(IndexFieldTypeFactory ori
194194
return (ElasticsearchIndexFieldTypeFactory) original;
195195
}
196196
else {
197-
throw CommonFailureLog.INSTANCE.elasticsearchExtensionOnUnknownType( original );
197+
throw ElasticsearchMiscLog.INSTANCE.elasticsearchExtensionOnUnknownType( original );
198198
}
199199
}
200200

@@ -207,7 +207,7 @@ public ElasticsearchIndexSchemaExport extendOrFail(SchemaExport original) {
207207
return ( (ElasticsearchIndexSchemaExport) original );
208208
}
209209
else {
210-
throw CommonFailureLog.INSTANCE.elasticsearchExtensionOnUnknownType( original );
210+
throw ElasticsearchMiscLog.INSTANCE.elasticsearchExtensionOnUnknownType( original );
211211
}
212212
}
213213
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/AbstractElasticsearchAnalysisComponentParametersStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import org.hibernate.search.backend.elasticsearch.analysis.model.dsl.ElasticsearchAnalysisComponentParametersStep;
1111
import org.hibernate.search.backend.elasticsearch.analysis.model.dsl.ElasticsearchAnalysisComponentTypeStep;
1212
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionContributor;
13-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
13+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
1414
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalysisDefinition;
1515

1616
import com.google.gson.JsonArray;
@@ -45,7 +45,7 @@ private ElasticsearchAnalysisComponentParametersStep param(String name, JsonElem
4545
}
4646
JsonElement previous = parameters.putIfAbsent( name, value );
4747
if ( previous != null ) {
48-
throw AnalyzerLog.INSTANCE.analysisComponentParameterConflict( name, previous, value );
48+
throw AnalysisLog.INSTANCE.analysisComponentParameterConflict( name, previous, value );
4949
}
5050
return this;
5151
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/ElasticsearchAnalyzerComponentsStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.hibernate.search.backend.elasticsearch.analysis.model.dsl.ElasticsearchAnalyzerTokenizerStep;
99
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionCollector;
1010
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionContributor;
11-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
11+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
1212
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalyzerDefinition;
1313
import org.hibernate.search.util.common.impl.StringHelper;
1414

@@ -53,7 +53,7 @@ public ElasticsearchAnalyzerOptionalComponentsStep tokenFilters(String... names)
5353
@Override
5454
public void contribute(ElasticsearchAnalysisDefinitionCollector collector) {
5555
if ( StringHelper.isEmpty( definition.getTokenizer() ) ) {
56-
throw AnalyzerLog.INSTANCE.invalidElasticsearchAnalyzerDefinition( name );
56+
throw AnalysisLog.INSTANCE.invalidElasticsearchAnalyzerDefinition( name );
5757
}
5858
collector.collect( name, definition );
5959
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/ElasticsearchAnalyzerParametersStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.hibernate.search.backend.elasticsearch.analysis.model.dsl.impl;
66

77
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionCollector;
8-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
8+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
99
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalyzerDefinition;
1010
import org.hibernate.search.util.common.impl.StringHelper;
1111

@@ -20,7 +20,7 @@ class ElasticsearchAnalyzerParametersStep
2020
@Override
2121
public void contribute(ElasticsearchAnalysisDefinitionCollector collector) {
2222
if ( StringHelper.isEmpty( definition.getType() ) ) {
23-
throw AnalyzerLog.INSTANCE.invalidElasticsearchTypedAnalyzerDefinition( name );
23+
throw AnalysisLog.INSTANCE.invalidElasticsearchTypedAnalyzerDefinition( name );
2424
}
2525
collector.collect( name, definition );
2626
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/ElasticsearchCharFilterParametersStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.hibernate.search.backend.elasticsearch.analysis.model.dsl.impl;
66

77
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionCollector;
8-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
8+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
99
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.CharFilterDefinition;
1010
import org.hibernate.search.util.common.impl.StringHelper;
1111

@@ -19,7 +19,7 @@ class ElasticsearchCharFilterParametersStep
1919
@Override
2020
public void contribute(ElasticsearchAnalysisDefinitionCollector collector) {
2121
if ( StringHelper.isEmpty( definition.getType() ) ) {
22-
throw AnalyzerLog.INSTANCE.invalidElasticsearchCharFilterDefinition( name );
22+
throw AnalysisLog.INSTANCE.invalidElasticsearchCharFilterDefinition( name );
2323
}
2424
collector.collect( name, definition );
2525
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/ElasticsearchTokenFilterParametersStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.hibernate.search.backend.elasticsearch.analysis.model.dsl.impl;
66

77
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionCollector;
8-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
8+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
99
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.TokenFilterDefinition;
1010
import org.hibernate.search.util.common.impl.StringHelper;
1111

@@ -19,7 +19,7 @@ class ElasticsearchTokenFilterParametersStep
1919
@Override
2020
public void contribute(ElasticsearchAnalysisDefinitionCollector collector) {
2121
if ( StringHelper.isEmpty( definition.getType() ) ) {
22-
throw AnalyzerLog.INSTANCE.invalidElasticsearchTokenFilterDefinition( name );
22+
throw AnalysisLog.INSTANCE.invalidElasticsearchTokenFilterDefinition( name );
2323
}
2424
collector.collect( name, definition );
2525
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/dsl/impl/ElasticsearchTokenizerParametersStep.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org.hibernate.search.backend.elasticsearch.analysis.model.dsl.impl;
66

77
import org.hibernate.search.backend.elasticsearch.analysis.model.impl.ElasticsearchAnalysisDefinitionCollector;
8-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
8+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
99
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.TokenizerDefinition;
1010
import org.hibernate.search.util.common.impl.StringHelper;
1111

@@ -19,7 +19,7 @@ class ElasticsearchTokenizerParametersStep
1919
@Override
2020
public void contribute(ElasticsearchAnalysisDefinitionCollector collector) {
2121
if ( StringHelper.isEmpty( definition.getType() ) ) {
22-
throw AnalyzerLog.INSTANCE.invalidElasticsearchTokenizerDefinition( name );
22+
throw AnalysisLog.INSTANCE.invalidElasticsearchTokenizerDefinition( name );
2323
}
2424
collector.collect( name, definition );
2525
}

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/analysis/model/impl/ElasticsearchAnalysisDefinitionRegistry.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import java.util.stream.Collectors;
1515

1616
import org.hibernate.search.backend.elasticsearch.analysis.impl.ElasticsearchAnalysisDescriptor;
17-
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalyzerLog;
17+
import org.hibernate.search.backend.elasticsearch.logging.impl.AnalysisLog;
1818
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.AnalyzerDefinition;
1919
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.CharFilterDefinition;
2020
import org.hibernate.search.backend.elasticsearch.lowlevel.index.analysis.impl.NormalizerDefinition;
@@ -71,23 +71,23 @@ public void collect(String name, NormalizerDefinition definition) {
7171
public void collect(String name, TokenizerDefinition definition) {
7272
TokenizerDefinition previous = tokenizerDefinitions.putIfAbsent( name, definition );
7373
if ( previous != null && previous != definition ) {
74-
throw AnalyzerLog.INSTANCE.tokenizerNamingConflict( name );
74+
throw AnalysisLog.INSTANCE.tokenizerNamingConflict( name );
7575
}
7676
}
7777

7878
@Override
7979
public void collect(String name, TokenFilterDefinition definition) {
8080
TokenFilterDefinition previous = tokenFilterDefinitions.putIfAbsent( name, definition );
8181
if ( previous != null && previous != definition ) {
82-
throw AnalyzerLog.INSTANCE.tokenFilterNamingConflict( name );
82+
throw AnalysisLog.INSTANCE.tokenFilterNamingConflict( name );
8383
}
8484
}
8585

8686
@Override
8787
public void collect(String name, CharFilterDefinition definition) {
8888
CharFilterDefinition previous = charFilterDefinitions.putIfAbsent( name, definition );
8989
if ( previous != null && previous != definition ) {
90-
throw AnalyzerLog.INSTANCE.charFilterNamingConflict( name );
90+
throw AnalysisLog.INSTANCE.charFilterNamingConflict( name );
9191
}
9292
}
9393
} );

‎backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchRequest;
2222
import org.hibernate.search.backend.elasticsearch.client.spi.ElasticsearchResponse;
2323
import org.hibernate.search.backend.elasticsearch.gson.spi.JsonLogHelper;
24-
import org.hibernate.search.backend.elasticsearch.logging.impl.CommonFailureLog;
2524
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchClientLog;
25+
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchMiscLog;
2626
import org.hibernate.search.backend.elasticsearch.logging.impl.ElasticsearchRequestLog;
2727
import org.hibernate.search.engine.common.execution.spi.SimpleScheduledExecutor;
2828
import org.hibernate.search.engine.common.timing.Deadline;
@@ -88,7 +88,7 @@ public <T> T unwrap(Class<T> clientClass) {
8888
if ( RestClient.class.isAssignableFrom( clientClass ) ) {
8989
return (T) restClientHolder.get();
9090
}
91-
throw CommonFailureLog.INSTANCE.clientUnwrappingWithUnknownType( clientClass, RestClient.class );
91+
throw ElasticsearchMiscLog.INSTANCE.clientUnwrappingWithUnknownType( clientClass, RestClient.class );
9292
}
9393

9494
private CompletableFuture<Response> send(ElasticsearchRequest elasticsearchRequest) {

0 commit comments

Comments
 (0)