Skip to content

Commit

Permalink
Deprecate the low-level REST client on JDK 7
Browse files Browse the repository at this point in the history
This commit deprecates the use of the low-level REST client in JDK
7. Support for the low-level REST client on JDK 7 will be removed in
7.0.0.
  • Loading branch information
jasontedor committed Feb 6, 2019
1 parent 2a0ecb9 commit 1b50cb8
Show file tree
Hide file tree
Showing 2 changed files with 112 additions and 0 deletions.
108 changes: 108 additions & 0 deletions client/rest/src/main/java/org/elasticsearch/bootstrap/JavaVersion.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
/*
* Licensed to Elasticsearch under one or more contributor
* license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright
* ownership. Elasticsearch licenses this file to you under
* the Apache License, Version 2.0 (the "License"); you may
* not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

package org.elasticsearch.bootstrap;

import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;

public class JavaVersion implements Comparable<JavaVersion> {

private final List<Integer> version;

public List<Integer> getVersion() {
return version;
}

private JavaVersion(List<Integer> version) {
if (version.size() >= 2 && version.get(0) == 1 && version.get(1) == 8) {
// for Java 8 there is ambiguity since both 1.8 and 8 are supported,
// so we rewrite the former to the latter
version = new ArrayList<>(version.subList(1, version.size()));
}
this.version = Collections.unmodifiableList(version);
}

public static JavaVersion parse(String value) {
Objects.requireNonNull(value);
if (!isValid(value)) {
throw new IllegalArgumentException("value");
}

List<Integer> version = new ArrayList<>();
String[] components = value.split("\\.");
for (String component : components) {
version.add(Integer.valueOf(component));
}

return new JavaVersion(version);
}

public static boolean isValid(String value) {
return value.matches("^0*[0-9]+(\\.[0-9]+)*$");
}

private static final JavaVersion CURRENT = parse(System.getProperty("java.specification.version"));

public static JavaVersion current() {
return CURRENT;
}

@Override
public int compareTo(JavaVersion o) {
int len = Math.max(version.size(), o.version.size());
for (int i = 0; i < len; i++) {
int d = (i < version.size() ? version.get(i) : 0);
int s = (i < o.version.size() ? o.version.get(i) : 0);
if (s < d)
return 1;
if (s > d)
return -1;
}
return 0;
}

@Override
public boolean equals(Object o) {
if (o == null || o.getClass() != getClass()) {
return false;
}
return compareTo((JavaVersion) o) == 0;
}

@Override
public int hashCode() {
return version.hashCode();
}

@Override
public String toString() {
final StringBuilder sb = new StringBuilder();
final Iterator<Integer> it = version.iterator();
sb.append(it.next());
while (it.hasNext()) {
sb.append(".").append(it.next());
}

return sb.toString();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.apache.http.nio.client.methods.HttpAsyncMethods;
import org.apache.http.nio.protocol.HttpAsyncRequestProducer;
import org.apache.http.nio.protocol.HttpAsyncResponseConsumer;
import org.elasticsearch.bootstrap.JavaVersion;
import org.elasticsearch.client.DeadHostState.TimeSupplier;

import javax.net.ssl.SSLHandshakeException;
Expand Down Expand Up @@ -122,6 +123,9 @@ public class RestClient implements Closeable {
this.nodeSelector = nodeSelector;
this.warningsHandler = strictDeprecationMode ? WarningsHandler.STRICT : WarningsHandler.PERMISSIVE;
setNodes(nodes);
if (JavaVersion.current().compareTo(JavaVersion.parse("1.8.0")) < 0) {
logger.warn("use of the low-level REST client on JDK 7 is deprecated and will be removed in version 7.0.0 of the client");
}
}

/**
Expand Down

0 comments on commit 1b50cb8

Please sign in to comment.