Skip to content

Commit 7db33fd

Browse files
committed
Fix inadvertent package changes for JavaVersion
This commit reverts some inadvertent imports to which JavaVersion to use. We have two copies of this class because the low-level REST client does not have a dependency on libs/core where we have another copy. We do not want to add libs/core as a dependency of the low-level REST client, hence the duplication. In the process of adding the duplication, we used the same package name as the copy in libs/core. This causes JAR hell in the tests though, since the test framework (so libs/core) and the low-level REST client would be on the classpath. To address this, an automatic refactoring was done in the IDE to change the package name of the copy in the low-level REST client. Yet, this refactoring automatically changed the import on some classes. This commit undoes that.
1 parent ea31741 commit 7db33fd

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

client/rest/src/main/java/org/elasticsearch/client/RestClient.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import org.elasticsearch.client.DeadHostState.TimeSupplier;
5050

5151
import javax.net.ssl.SSLHandshakeException;
52+
5253
import java.io.Closeable;
5354
import java.io.IOException;
5455
import java.net.ConnectException;

0 commit comments

Comments
 (0)