From 2dc8a36662bc8fd794903c80a2777c750317a25d Mon Sep 17 00:00:00 2001 From: Carsten Hammer Date: Thu, 22 Aug 2019 20:56:51 +0200 Subject: [PATCH] Protected member in final class any instances of members being declared protected in classes that are declared final. Such members may be declared private or package-visible instead. --- .../client/impl/CountingOutputStream.java | 2 +- .../search/dsl/sort/spi/StaticSortThenStep.java | 2 +- .../BindingUsingPropertyMarkerAccessIT.java | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/CountingOutputStream.java b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/CountingOutputStream.java index 3feb5165400..45c20dae3a4 100644 --- a/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/CountingOutputStream.java +++ b/backend/elasticsearch/src/main/java/org/hibernate/search/backend/elasticsearch/client/impl/CountingOutputStream.java @@ -35,7 +35,7 @@ public void write(byte[] b, int off, int len) throws IOException { count( len ); } - protected void count(int written) { + void count(int written) { if ( written > 0 ) { bytesWritten += written; } diff --git a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/StaticSortThenStep.java b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/StaticSortThenStep.java index 5b363019e9e..4c26a7f84c3 100644 --- a/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/StaticSortThenStep.java +++ b/engine/src/main/java/org/hibernate/search/engine/search/dsl/sort/spi/StaticSortThenStep.java @@ -7,7 +7,7 @@ package org.hibernate.search.engine.search.dsl.sort.spi; public final class StaticSortThenStep extends AbstractSortThenStep { - protected final B builder; + final B builder; public StaticSortThenStep(SearchSortDslContext parentDslContext, B builder) { diff --git a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java index e33628cf0dc..1fb59dd3f54 100644 --- a/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java +++ b/integrationtest/mapper/orm/src/test/java/org/hibernate/search/integrationtest/mapper/orm/model/BindingUsingPropertyMarkerAccessIT.java @@ -163,10 +163,10 @@ public ProtectedFieldAccessEntity create(int id, double latitude, double longitu private Integer id; @Latitude - protected Double latitude; + Double latitude; @Longitude - protected Double longitude; + Double longitude; } @Entity @@ -295,29 +295,29 @@ public ProtectedMethodAccessEntity create(int id, double latitude, double longit // Put the @Id annotation here to set the Hibernate ORM access type to "property" @Id @DocumentId - protected Integer getId() { + Integer getId() { return idWithUnpredictableName; } - protected void setId(Integer id) { + void setId(Integer id) { this.idWithUnpredictableName = id; } @Latitude - protected Double getLatitude() { + Double getLatitude() { return latitudeWithUnpredictableName; } - protected void setLatitude(Double latitude) { + void setLatitude(Double latitude) { this.latitudeWithUnpredictableName = latitude; } @Longitude - protected Double getLongitude() { + Double getLongitude() { return longitudeWithUnpredictableName; } - protected void setLongitude(Double longitude) { + void setLongitude(Double longitude) { this.longitudeWithUnpredictableName = longitude; } }