Skip to content

Commit

Permalink
Fix Javadoc issues in 6.x for JDK11 (#33579)
Browse files Browse the repository at this point in the history
This commit fixes a handful of Javadoc issues in the 6.x branch that prevent a
successful build (of `precommit` and `assemble`) against JDK 11.
  • Loading branch information
DaveCTurner authored and Tim-Brooks committed Sep 10, 2018
1 parent d28c23a commit c7d207f
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ private static List<String> objectsPaths(final String path) {
}

/**
* Retrieves the object name from all derives paths named {pathX} where 0 <= X < 10.
* Retrieves the object name from all derives paths named {pathX} where X is between 0 and 9 inclusive.
*
* This is the counterpart of {@link #objectsPaths(String)}
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ public void testEnsureNoSelfReferences() throws IOException {

/**
* Test that the same map written multiple times do not trigger the self-reference check in
* {@link CollectionUtils#ensureNoSelfReferences(Object, String)} (Object)}
* {@link CollectionUtils#ensureNoSelfReferences(Object)} (Object)}
*/
public void testRepeatedMapsAndNoSelfReferences() throws Exception {
Map<String, Object> mapB = singletonMap("b", "B");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class NestedAggregatorTests extends AggregatorTestCase {
private final SeqNoFieldMapper.SequenceIDFields sequenceIDFields = SeqNoFieldMapper.SequenceIDFields.emptySeqID();

/**
* For each provided field type, we also register an alias with name <field>-alias.
* For each provided field type, we also register an alias with name <code>field</code>-alias.
*/
@Override
protected Map<String, MappedFieldType> getFieldAliases(MappedFieldType... fieldTypes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public class ReverseNestedAggregatorTests extends AggregatorTestCase {
private static final String MAX_AGG_NAME = "maxAgg";

/**
* For each provided field type, we also register an alias with name <field>-alias.
* For each provided field type, we also register an alias with name <code>field</code>-alias.
*/
@Override
protected Map<String, MappedFieldType> getFieldAliases(MappedFieldType... fieldTypes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void setUpTest() throws Exception {
}

/**
* For each provided field type, we also register an alias with name <field>-alias.
* For each provided field type, we also register an alias with name <code>field</code>-alias.
*/
@Override
protected Map<String, MappedFieldType> getFieldAliases(MappedFieldType... fieldTypes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
public class SignificantTextAggregatorTests extends AggregatorTestCase {

/**
* For each provided field type, we also register an alias with name <field>-alias.
* For each provided field type, we also register an alias with name <code>field</code>-alias.
*/
@Override
protected Map<String, MappedFieldType> getFieldAliases(MappedFieldType... fieldTypes) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,6 @@ private void addSslSettingsForKeyPair(Settings.Builder builder, Path key, String

/**
* Collects all the certificates that are normally trusted by the node ( contained in testnode.jks )
*
* @return
*/
List<String> getNodeTrustedCertificates() {
Path testnodeCert =
Expand Down

0 comments on commit c7d207f

Please sign in to comment.