HSEARCH-3922 Do not use "get"/"set" prefixes for SPI methods in the E…

…lasticsearch backend module
hibernate · May 20, 2020 · 08511f2 · 08511f2
1 parent b3ffe3b
commit 08511f2
Show file tree

Hide file tree

Showing 20 changed files with 101 additions and 101 deletions.
diff --git a/.../java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientImpl.java b/.../java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientImpl.java
@@ -131,10 +131,10 @@ public void onFailure(Exception exception) {
 				}
 				);
 
-		long currentTimeoutValue = ( elasticsearchRequest.getTimeoutValue() == null ) ?
-				globalTimeoutValue : elasticsearchRequest.getTimeoutValue();
-		TimeUnit currentTimeoutUnit = ( elasticsearchRequest.getTimeoutUnit() == null ) ?
-				globalTimeoutUnit : elasticsearchRequest.getTimeoutUnit();
+		long currentTimeoutValue = ( elasticsearchRequest.timeoutValue() == null ) ?
+				globalTimeoutValue : elasticsearchRequest.timeoutValue();
+		TimeUnit currentTimeoutUnit = ( elasticsearchRequest.timeoutUnit() == null ) ?
+				globalTimeoutUnit : elasticsearchRequest.timeoutUnit();
 
 		/*
 		 * TODO HSEARCH-3590 maybe the callback should also cancel the request?
@@ -158,9 +158,9 @@ public void onFailure(Exception exception) {
 	}
 
 	private static Request toRequest(ElasticsearchRequest elasticsearchRequest, HttpEntity entity) {
-		Request request = new Request( elasticsearchRequest.getMethod(), elasticsearchRequest.getPath() );
+		Request request = new Request( elasticsearchRequest.method(), elasticsearchRequest.path() );
 
-		for ( Entry<String, String> parameter : elasticsearchRequest.getParameters().entrySet() ) {
+		for ( Entry<String, String> parameter : elasticsearchRequest.parameters().entrySet() ) {
 			request.addParameter( parameter.getKey(), parameter.getValue() );
 		}
 
@@ -208,16 +208,16 @@ private void log(ElasticsearchRequest request, long start, ElasticsearchResponse
 		long executionTimeNs = System.nanoTime() - start;
 		long executionTimeMs = TimeUnit.NANOSECONDS.toMillis( executionTimeNs );
 		if ( requestLog.isTraceEnabled() ) {
-			requestLog.executedRequest( request.getMethod(), request.getPath(), request.getParameters(),
-					request.getBodyParts().size(), executionTimeMs,
-					response.getStatusCode(), response.getStatusMessage(),
-					jsonLogHelper.toString( request.getBodyParts() ),
-					jsonLogHelper.toString( response.getBody() ) );
+			requestLog.executedRequest( request.method(), request.path(), request.parameters(),
+					request.bodyParts().size(), executionTimeMs,
+					response.statusCode(), response.statusMessage(),
+					jsonLogHelper.toString( request.bodyParts() ),
+					jsonLogHelper.toString( response.body() ) );
 		}
 		else {
-			requestLog.executedRequest( request.getMethod(), request.getPath(), request.getParameters(),
-					request.getBodyParts().size(), executionTimeMs,
-					response.getStatusCode(), response.getStatusMessage() );
+			requestLog.executedRequest( request.method(), request.path(), request.parameters(),
+					request.bodyParts().size(), executionTimeMs,
+					response.statusCode(), response.statusMessage() );
 		}
 	}
 

diff --git a/...java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientUtils.java b/...java/org/hibernate/search/backend/elasticsearch/client/impl/ElasticsearchClientUtils.java
@@ -41,7 +41,7 @@ public static boolean isSuccessCode(int code) {
 	}
 
 	public static HttpEntity toEntity(Gson gson, ElasticsearchRequest request) throws IOException {
-		final List<JsonObject> bodyParts = request.getBodyParts();
+		final List<JsonObject> bodyParts = request.bodyParts();
 		if ( bodyParts.isEmpty() ) {
 			return null;
 		}
@@ -63,11 +63,11 @@ private static ElasticsearchVersion tryGetElasticsearchVersion(ElasticsearchClie
 		try {
 			response = Futures.unwrappedExceptionJoin( client.submit( request ) );
 
-			if ( !ElasticsearchClientUtils.isSuccessCode( response.getStatusCode() ) ) {
+			if ( !ElasticsearchClientUtils.isSuccessCode( response.statusCode() ) ) {
 				throw log.elasticsearchResponseIndicatesFailure();
 			}
 
-			return VERSION_ACCESSOR.get( response.getBody() )
+			return VERSION_ACCESSOR.get( response.body() )
 					.map( ElasticsearchVersion::of )
 					.orElseThrow( () -> new AssertionFailure( "Missing version number in JSON response" ) );
 		}

diff --git a/...main/java/org/hibernate/search/backend/elasticsearch/client/spi/ElasticsearchRequest.java b/...main/java/org/hibernate/search/backend/elasticsearch/client/spi/ElasticsearchRequest.java
@@ -58,27 +58,27 @@ private ElasticsearchRequest(Builder builder) {
 		this.timeoutUnit = builder.timeoutUnit;
 	}
 
-	public String getMethod() {
+	public String method() {
 		return method;
 	}
 
-	public String getPath() {
+	public String path() {
 		return path;
 	}
 
-	public Map<String, String> getParameters() {
+	public Map<String, String> parameters() {
 		return parameters;
 	}
 
-	public List<JsonObject> getBodyParts() {
+	public List<JsonObject> bodyParts() {
 		return bodyParts;
 	}
 
-	public Long getTimeoutValue() {
+	public Long timeoutValue() {
 		return timeoutValue;
 	}
 
-	public TimeUnit getTimeoutUnit() {
+	public TimeUnit timeoutUnit() {
 		return timeoutUnit;
 	}
 

diff --git a/...ain/java/org/hibernate/search/backend/elasticsearch/client/spi/ElasticsearchResponse.java b/...ain/java/org/hibernate/search/backend/elasticsearch/client/spi/ElasticsearchResponse.java
@@ -24,15 +24,15 @@ public ElasticsearchResponse(int statusCode, String statusMessage, JsonObject bo
 		this.body = body;
 	}
 
-	public int getStatusCode() {
+	public int statusCode() {
 		return statusCode;
 	}
 
-	public String getStatusMessage() {
+	public String statusMessage() {
 		return statusMessage;
 	}
 
-	public JsonObject getBody() {
+	public JsonObject body() {
 		return body;
 	}
 

diff --git a/...rg/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchRequestFormatter.java b/...rg/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchRequestFormatter.java
@@ -34,11 +34,11 @@ private static String formatRequest(ElasticsearchRequest request) {
 		//Wild guess for some tuning. The only certainty is that the default (16) is too small.
 		StringBuilder sb = new StringBuilder( 180 );
 
-		sb.append( request.getMethod() )
+		sb.append( request.method() )
 				.append( " " )
-				.append( request.getPath() )
+				.append( request.path() )
 				.append( " with parameters " )
-				.append( request.getParameters() );
+				.append( request.parameters() );
 
 		return sb.toString();
 	}

diff --git a/...g/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchResponseFormatter.java b/...g/hibernate/search/backend/elasticsearch/logging/impl/ElasticsearchResponseFormatter.java
@@ -37,11 +37,11 @@ private static String formatResponse(ElasticsearchResponse response) {
 		//Wild guess for some tuning. The only certainty is that the default (16) is too small.
 		//Also useful to hint the builder to use larger increment steps.
 		StringBuilder sb = new StringBuilder( 180 );
-		sb.append( response.getStatusCode() )
+		sb.append( response.statusCode() )
 				.append( " '" )
-				.append( response.getStatusMessage() )
+				.append( response.statusMessage() )
 				.append( "' with body " )
-				.append( helper.toString( response.getBody() ) );
+				.append( helper.toString( response.body() ) );
 
 		return sb.toString();
 	}

diff --git a/...end/elasticsearch/search/query/impl/ElasticsearchSearchRequestTransformerContextImpl.java b/...end/elasticsearch/search/query/impl/ElasticsearchSearchRequestTransformerContextImpl.java
@@ -39,15 +39,15 @@ static Function<ElasticsearchRequest, ElasticsearchRequest> createTransformerFun
 
 	private ElasticsearchSearchRequestTransformerContextImpl(ElasticsearchRequest originalRequest) {
 		this.originalRequest = originalRequest;
-		List<JsonObject> originalBodyParts = originalRequest.getBodyParts();
+		List<JsonObject> originalBodyParts = originalRequest.bodyParts();
 		if ( originalBodyParts.size() != 1 ) {
 			throw new AssertionFailure(
 					"Request transformation was applied to a request with no body part or more than one body parts."
 							+ " There is a bug in Hibernate Search, please report it."
 			);
 		}
 		this.originalBody = originalBodyParts.get( 0 );
-		this.path = originalRequest.getPath();
+		this.path = originalRequest.path();
 	}
 
 	@Override
@@ -65,7 +65,7 @@ public void path(String newPath) {
 	public Map<String, String> parametersMap() {
 		// Avoid side-effects on the original request
 		if ( potentiallyTransformedParametersMap == null ) {
-			potentiallyTransformedParametersMap = new LinkedHashMap<>( originalRequest.getParameters() );
+			potentiallyTransformedParametersMap = new LinkedHashMap<>( originalRequest.parameters() );
 		}
 		return potentiallyTransformedParametersMap;
 	}
@@ -82,12 +82,12 @@ public JsonObject body() {
 	public ElasticsearchRequest apply(ElasticsearchSearchRequestTransformer transformer) {
 		transformer.transform( this );
 
-		ElasticsearchRequest.Builder builder = ElasticsearchRequest.builder( originalRequest.getMethod() );
+		ElasticsearchRequest.Builder builder = ElasticsearchRequest.builder( originalRequest.method() );
 
 		builder.wholeEncodedPath( path );
 
 		Map<String, String> parameters = potentiallyTransformedParametersMap != null
-				? potentiallyTransformedParametersMap : originalRequest.getParameters();
+				? potentiallyTransformedParametersMap : originalRequest.parameters();
 		parameters.forEach( builder::param );
 
 		JsonObject body = potentiallyTransformedBody != null ? potentiallyTransformedBody : originalBody;

diff --git a/...in/java/org/hibernate/search/backend/elasticsearch/work/impl/AbstractNonBulkableWork.java b/...in/java/org/hibernate/search/backend/elasticsearch/work/impl/AbstractNonBulkableWork.java
@@ -41,7 +41,7 @@ public String toString() {
 		return new StringBuilder()
 				.append( getClass().getSimpleName() )
 				.append( "[" )
-				.append( "path = " ).append( request.getPath() )
+				.append( "path = " ).append( request.path() )
 				.append( "]" )
 				.toString();
 	}

diff --git a/...icsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/BulkWork.java b/...icsearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/BulkWork.java
@@ -30,7 +30,7 @@ protected BulkWork(Builder builder) {
 
 	@Override
 	protected BulkResult generateResult(ElasticsearchWorkExecutionContext context, ElasticsearchResponse response) {
-		JsonObject parsedResponseBody = response.getBody();
+		JsonObject parsedResponseBody = response.body();
 		JsonArray resultItems = BULK_ITEMS.get( parsedResponseBody ).orElseGet( JsonArray::new );
 		return new BulkResultImpl( resultItems );
 	}

diff --git a/...csearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CountWork.java b/...csearch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CountWork.java
@@ -31,7 +31,7 @@ protected CountWork(Builder builder) {
 
 	@Override
 	protected Long generateResult(ElasticsearchWorkExecutionContext context, ElasticsearchResponse response) {
-		JsonObject body = response.getBody();
+		JsonObject body = response.body();
 		return COUNT_ACCESSOR.get( body ).get();
 	}
 

diff --git a/...h/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CreateIndexWork.java b/...h/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/CreateIndexWork.java
@@ -33,7 +33,7 @@ protected CreateIndexWork(Builder builder) {
 
 	@Override
 	protected CreateIndexResult generateResult(ElasticsearchWorkExecutionContext context, ElasticsearchResponse response) {
-		int statusCode = response.getStatusCode();
+		int statusCode = response.statusCode();
 		if ( ElasticsearchClientUtils.isSuccessCode( statusCode ) ) {
 			return CreateIndexResult.CREATED;
 		}

diff --git a/...te/search/backend/elasticsearch/work/impl/DefaultElasticsearchRequestSuccessAssessor.java b/...te/search/backend/elasticsearch/work/impl/DefaultElasticsearchRequestSuccessAssessor.java
@@ -81,8 +81,8 @@ public String toString() {
 
 	@Override
 	public void checkSuccess(ElasticsearchResponse response) throws SearchException {
-		JsonObject responseBody = response.getBody();
-		Optional<Integer> statusCode = Optional.of( response.getStatusCode() );
+		JsonObject responseBody = response.body();
+		Optional<Integer> statusCode = Optional.of( response.statusCode() );
 		checkSuccess( statusCode, responseBody );
 	}
 

diff --git a/...earch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ExplainWork.java b/...earch/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ExplainWork.java
@@ -38,10 +38,10 @@ private ExplainWork(Builder builder) {
 	@Override
 	protected ExplainResult generateResult(ElasticsearchWorkExecutionContext context,
 			ElasticsearchResponse response) {
-		if ( response.getStatusCode() == 404 ) {
+		if ( response.statusCode() == 404 ) {
 			throw log.explainUnknownDocument( id );
 		}
-		JsonObject body = response.getBody();
+		JsonObject body = response.body();
 		return new ExplainResultImpl( body );
 	}
 

diff --git a/.../main/java/org/hibernate/search/backend/elasticsearch/work/impl/GetIndexMetadataWork.java b/.../main/java/org/hibernate/search/backend/elasticsearch/work/impl/GetIndexMetadataWork.java
@@ -47,7 +47,7 @@ private GetIndexMetadataWork(Builder builder) {
 	@Override
 	protected List<ExistingIndexMetadata> generateResult(ElasticsearchWorkExecutionContext context,
 			ElasticsearchResponse response) {
-		JsonObject body = response.getBody();
+		JsonObject body = response.body();
 		List<ExistingIndexMetadata> result = new ArrayList<>();
 		for ( Map.Entry<String, JsonElement> entry : body.entrySet() ) {
 			JsonObject indexAsObject = entry.getValue().getAsJsonObject();

diff --git a/...search/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ScrollWork.java b/...search/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/ScrollWork.java
@@ -25,7 +25,7 @@ protected ScrollWork(Builder<R> builder) {
 
 	@Override
 	protected R generateResult(ElasticsearchWorkExecutionContext context, ElasticsearchResponse response) {
-		JsonObject body = response.getBody();
+		JsonObject body = response.body();
 		return resultExtractor.extract( body );
 	}
 

diff --git a/...search/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/SearchWork.java b/...search/src/main/java/org/hibernate/search/backend/elasticsearch/work/impl/SearchWork.java
@@ -38,16 +38,16 @@ protected SearchWork(Builder<R> builder) {
 	@Override
 	protected CompletableFuture<?> beforeExecute(ElasticsearchWorkExecutionContext executionContext, ElasticsearchRequest request) {
 		queryLog.executingElasticsearchQuery(
-				request.getPath(),
-				request.getParameters(),
-				executionContext.getGsonProvider().getLogHelper().toString( request.getBodyParts() )
+				request.path(),
+				request.parameters(),
+				executionContext.getGsonProvider().getLogHelper().toString( request.bodyParts() )
 				);
 		return super.beforeExecute( executionContext, request );
 	}
 
 	@Override
 	protected R generateResult(ElasticsearchWorkExecutionContext context, ElasticsearchResponse response) {
-		JsonObject body = response.getBody();
+		JsonObject body = response.body();
 		return resultExtractor.extract( body );
 	}
 

diff --git a/...arch/src/test/java/org/hibernate/search/backend/elasticsearch/work/impl/BulkWorkTest.java b/...arch/src/test/java/org/hibernate/search/backend/elasticsearch/work/impl/BulkWorkTest.java
@@ -141,14 +141,14 @@ public void execute_http500() {
 	private void assertBulkRequest(ElasticsearchRequest request, int ... bulkableIndices) {
 		assertThat( request ).isNotNull();
 		assertSoftly( softly -> {
-			softly.assertThat( request.getMethod() ).isEqualTo( "POST" );
-			softly.assertThat( request.getPath() ).isEqualTo( "/_bulk" );
+			softly.assertThat( request.method() ).isEqualTo( "POST" );
+			softly.assertThat( request.path() ).isEqualTo( "/_bulk" );
 			List<JsonObject> expectedBodyParts = new ArrayList<>();
 			for ( int bulkableIndex : bulkableIndices ) {
 				expectedBodyParts.add( bulkableWorkMetadata( bulkableIndex ) );
 				expectedBodyParts.add( bulkableWorkBody( bulkableIndex ) );
 			}
-			softly.assertThat( request.getBodyParts() ).containsExactlyElementsOf( expectedBodyParts );
+			softly.assertThat( request.bodyParts() ).containsExactlyElementsOf( expectedBodyParts );
 		} );
 	}