HSEARCH-3478 Sonar: Class names should not shadow interfaces or super…

…classes

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/AbstractSimpleBulkableElasticsearchWork.java

@@ -31,7 +31,7 @@ public abstract class AbstractSimpleBulkableElasticsearchWork<R>
 
 	private final JsonObject bulkableActionMetadata;
 
-	protected AbstractSimpleBulkableElasticsearchWork(Builder<?> builder) {
+	protected AbstractSimpleBulkableElasticsearchWork(AbstractBuilder builder) {
 		super( builder );
 		this.bulkableActionMetadata = builder.buildBulkableActionMetadata();
 	}
@@ -103,10 +103,10 @@ private CompletableFuture<R> handleResult(ElasticsearchWorkExecutionContext exec
 				.thenApply( ignored -> result );
 	}
 
-	protected abstract static class Builder<B>
-			extends AbstractSimpleElasticsearchWork.Builder<B> {
+	protected abstract static class AbstractBuilder<B>
+			extends AbstractSimpleElasticsearchWork.AbstractBuilder<B> {
 
-		public Builder(URLEncodedString dirtiedIndexName, ElasticsearchRequestSuccessAssessor resultAssessor) {
+		public AbstractBuilder(URLEncodedString dirtiedIndexName, ElasticsearchRequestSuccessAssessor resultAssessor) {
 			super( dirtiedIndexName, resultAssessor );
 		}
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/AbstractSimpleElasticsearchWork.java

@@ -32,7 +32,7 @@ public abstract class AbstractSimpleElasticsearchWork<R> implements Elasticsearc
 	protected final ElasticsearchRequestSuccessAssessor resultAssessor;
 	protected final boolean markIndexDirty;
 
-	protected AbstractSimpleElasticsearchWork(Builder<?> builder) {
+	protected AbstractSimpleElasticsearchWork(AbstractBuilder<?> builder) {
 		this.request = builder.buildRequest();
 		this.dirtiedIndexName = builder.dirtiedIndexName;
 		this.resultAssessor = builder.resultAssessor;
@@ -107,13 +107,13 @@ private CompletableFuture<R> handleResult(ElasticsearchWorkExecutionContext exec
 	}
 
 	@SuppressWarnings("unchecked") // By contract, subclasses must implement B
-	protected abstract static class Builder<B> {
+	protected abstract static class AbstractBuilder<B> {
 		protected final URLEncodedString dirtiedIndexName;
 		protected ElasticsearchRequestSuccessAssessor resultAssessor;
 
 		protected boolean markIndexDirty;
 
-		public Builder(URLEncodedString dirtiedIndexName, ElasticsearchRequestSuccessAssessor resultAssessor) {
+		public AbstractBuilder(URLEncodedString dirtiedIndexName, ElasticsearchRequestSuccessAssessor resultAssessor) {
 			this.dirtiedIndexName = dirtiedIndexName;
 			this.resultAssessor = resultAssessor;
 		}

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ClearScrollWork.java

@@ -28,7 +28,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements ClearScrollWorkBuilder {
 		private final String scrollId;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CloseIndexWork.java

@@ -24,7 +24,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements CloseIndexWorkBuilder {
 
 		private final URLEncodedString indexName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CountWork.java

@@ -35,7 +35,7 @@ protected Long generateResult(ElasticsearchWorkExecutionContext context, Elastic
 		return COUNT_ACCESSOR.get( body ).get();
 	}
 
-	public static class Builder extends AbstractSimpleElasticsearchWork.Builder<Builder> implements CountWorkBuilder {
+	public static class Builder extends AbstractBuilder<Builder> implements CountWorkBuilder {
 
 		private final List<URLEncodedString> indexNames = new ArrayList<>();
 		private final List<URLEncodedString> typeNames = new ArrayList<>();

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CreateIndexWork.java

@@ -41,7 +41,7 @@ protected CreateIndexResult generateResult(ElasticsearchWorkExecutionContext con
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements CreateIndexWorkBuilder {
 		private final GsonProvider gsonProvider;
 		private final URLEncodedString indexName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/DeleteByQueryWork.java

@@ -48,7 +48,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements DeleteByQueryWorkBuilder {
 		private final URLEncodedString indexName;
 		private final JsonObject payload;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/DeleteWork.java

@@ -36,7 +36,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, JsonObj
 	}
 
 	public static class Builder
-			extends AbstractSimpleBulkableElasticsearchWork.Builder<Builder>
+			extends AbstractSimpleBulkableElasticsearchWork.AbstractBuilder<Builder>
 			implements DeleteWorkBuilder {
 		private final URLEncodedString indexName;
 		private final URLEncodedString typeName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/DropIndexWork.java

@@ -26,7 +26,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements DropIndexWorkBuilder {
 		private final URLEncodedString indexName;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ExplainWork.java

@@ -32,7 +32,7 @@ protected ExplainResult generateResult(ElasticsearchWorkExecutionContext context
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements ExplainWorkBuilder {
 		private final URLEncodedString indexName;
 		private final URLEncodedString typeName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/FlushWork.java

@@ -46,7 +46,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements FlushWorkBuilder {
 		private final RefreshWorkBuilder refreshWorkBuilder;
 		private final Set<URLEncodedString> indexNames = new HashSet<>();

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/GetIndexSettingsWork.java

@@ -53,7 +53,7 @@ protected IndexSettings generateResult(ElasticsearchWorkExecutionContext context
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements GetIndexSettingsWorkBuilder {
 		private final URLEncodedString indexName;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/GetIndexTypeMappingWork.java

@@ -59,7 +59,7 @@ protected RootTypeMapping generateResult(ElasticsearchWorkExecutionContext conte
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements GetIndexTypeMappingWorkBuilder {
 		private final URLEncodedString indexName;
 		private final URLEncodedString typeName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/IndexExistsWork.java

@@ -31,7 +31,7 @@ protected Boolean generateResult(ElasticsearchWorkExecutionContext context,
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements IndexExistsWorkBuilder {
 		private final URLEncodedString indexName;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/IndexWork.java

@@ -33,7 +33,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, JsonObj
 	}
 
 	public static class Builder
-			extends AbstractSimpleBulkableElasticsearchWork.Builder<Builder>
+			extends AbstractSimpleBulkableElasticsearchWork.AbstractBuilder<Builder>
 			implements IndexWorkBuilder {
 		private final URLEncodedString indexName;
 		private final URLEncodedString typeName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/OpenIndexWork.java

@@ -27,7 +27,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements OpenIndexWorkBuilder {
 		private final URLEncodedString indexName;
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/OptimizeWork.java

@@ -34,7 +34,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements OptimizeWorkBuilder {
 		private List<URLEncodedString> indexNames = new ArrayList<>();
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/PutIndexSettingsWork.java

@@ -32,7 +32,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements PutIndexSettingsWorkBuilder {
 		private final URLEncodedString indexName;
 		private final JsonObject payload;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/PutIndexTypeMappingWork.java

@@ -32,7 +32,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements PutIndexMappingWorkBuilder {
 		private final URLEncodedString indexName;
 		private final URLEncodedString typeName;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/RefreshWork.java

@@ -30,7 +30,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements RefreshWorkBuilder {
 		private List<URLEncodedString> indexNames = new ArrayList<>();
 

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ScrollWork.java

@@ -33,7 +33,7 @@ protected ElasticsearchLoadableSearchResult<T> generateResult(ElasticsearchWorkE
 	}
 
 	public static class Builder<T>
-			extends AbstractSimpleElasticsearchWork.Builder<Builder<T>>
+			extends AbstractBuilder<Builder<T>>
 			implements ScrollWorkBuilder<T> {
 		private final String scrollId;
 		private final String scrollTimeout;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/SearchWork.java

@@ -54,7 +54,7 @@ protected ElasticsearchLoadableSearchResult<T> generateResult(ElasticsearchWorkE
 	}
 
 	public static class Builder<T>
-			extends AbstractSimpleElasticsearchWork.Builder<Builder<T>>
+			extends AbstractBuilder<Builder<T>>
 			implements SearchWorkBuilder<T> {
 		private final JsonObject payload;
 		private final ElasticsearchSearchResultExtractor<T> resultExtractor;

backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/WaitForIndexStatusWork.java

@@ -36,7 +36,7 @@ protected Void generateResult(ElasticsearchWorkExecutionContext context, Elastic
 	}
 
 	public static class Builder
-			extends AbstractSimpleElasticsearchWork.Builder<Builder>
+			extends AbstractBuilder<Builder>
 			implements WaitForIndexStatusWorkBuilder {
 		private final URLEncodedString indexName;
 		private final ElasticsearchIndexStatus requiredStatus;