Skip to content

Commit

Permalink
[Javadoc] add missing javadocs for :example-plugin modules (opensearc…
Browse files Browse the repository at this point in the history
…h-project#4540)

* Add javadocs for example-plugins:custom-settings module

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs for example-plugins:custom-significance-heuristic

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs for example-plugins:custom-suggester

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs to example-plugins:painless-allowlist

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs to example-plugins:rescore

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs to example-plugins:rest-handler

Signed-off-by: Daniel Widdis <[email protected]>

* Add javadocs to example-plugins:script-expert-scoring

Signed-off-by: Daniel Widdis <[email protected]>

* Remove exclusions for module which aren't giving javadoc errors

Signed-off-by: Daniel Widdis <[email protected]>

* CI testing apparently needs to instantiate a no-op class

Signed-off-by: Daniel Widdis <[email protected]>

Signed-off-by: Daniel Widdis <[email protected]>
  • Loading branch information
dbwiddis authored and Vishalks committed Sep 28, 2022
1 parent d14dd5d commit 551bd1b
Show file tree
Hide file tree
Showing 30 changed files with 460 additions and 23 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- Added missing javadocs for `:distribution:tools` modules ([#4483](https://github.com/opensearch-project/OpenSearch/pull/4483))
- Add BWC version 2.3.1 ([#4513](https://github.com/opensearch-project/OpenSearch/pull/4513))
- [Segment Replication] Add snapshot and restore tests for segment replication feature ([#3993](https://github.com/opensearch-project/OpenSearch/pull/3993))
- Added missing javadocs for `:example-plugins` modules ([#4540](https://github.com/opensearch-project/OpenSearch/pull/4540))

### Dependencies
- Bumps `reactive-streams` from 1.0.3 to 1.0.4
Expand Down
10 changes: 0 additions & 10 deletions gradle/missing-javadoc.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,6 @@ configure([
project(":client:client-benchmark-noop-api-plugin"),
project(":client:rest-high-level"),
project(":client:test"),
project(":doc-tools"),
project(":example-plugins:custom-settings"),
project(":example-plugins:custom-significance-heuristic"),
project(":example-plugins:custom-suggester"),
project(":example-plugins:painless-allowlist"),
project(":example-plugins:rescore"),
project(":example-plugins:rest-handler"),
project(":example-plugins:script-expert-scoring"),
project(":libs:opensearch-cli"),
project(":libs:opensearch-core"),
project(":libs:opensearch-dissect"),
Expand Down Expand Up @@ -155,9 +147,7 @@ configure([
project(":plugins:store-smb"),
project(":plugins:transport-nio"),
project(":qa:die-with-dignity"),
project(":qa:os"),
project(":qa:wildfly"),
project(":rest-api-spec"),
project(":test:external-modules:test-delayed-aggs"),
project(":test:fixtures:azure-fixture"),
project(":test:fixtures:gcs-fixture"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,13 @@ public class ExampleCustomSettingsConfig {
private final List<Integer> list;
private final String filtered;

/**
* Instantiate this object based on the specified environment.
*
* @param environment The environment including paths to custom setting configuration files
*/
public ExampleCustomSettingsConfig(final Environment environment) {
// Elasticsearch config directory
// OpenSearch config directory
final Path configDir = environment.configDir();

// Resolve the plugin's custom settings file
Expand All @@ -121,22 +126,47 @@ public ExampleCustomSettingsConfig(final Environment environment) {
assert secured != null;
}

/**
* Gets the value of the custom.simple String setting.
*
* @return the custom.simple value
*/
public String getSimple() {
return simple;
}

/**
* Gets the value of the custom.bool boolean setting.
*
* @return the custom.bool value
*/
public Boolean getBool() {
return bool;
}

/**
* Gets the value of the custom.validated String setting.
*
* @return the custom.validated value
*/
public String getValidated() {
return validated;
}

/**
* Gets the value of the custom.filtered String setting.
*
* @return the custom.filtered value
*/
public String getFiltered() {
return filtered;
}

/**
* Gets the value of the custom.list list of integers setting.
*
* @return the custom.list value
*/
public List<Integer> getList() {
return list;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,26 @@

import static java.util.stream.Collectors.toList;

/**
* An example plugin that includes custom settings.
*/
public class ExampleCustomSettingsPlugin extends Plugin {

private final ExampleCustomSettingsConfig config;

/**
* Instantiate this plugin with the specified settings and config path.
*
* @param settings The settings for this plugin.
* @param configPath The path to this plugin's configuration files.
*/
public ExampleCustomSettingsPlugin(final Settings settings, final Path configPath) {
this.config = new ExampleCustomSettingsConfig(new Environment(settings, configPath));

// asserts that the setting has been correctly loaded from the custom setting file
assert "secret".equals(config.getFiltered());
}

/**
* @return the plugin's custom settings
*/
@Override
public List<Setting<?>> getSettings() {
return Arrays.asList(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

/**
* Example classes demonstrating the use of custom settings in a plugin.
*/
package org.opensearch.example.customsettings;
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
* Plugin declaring a custom {@link SignificanceHeuristic}.
*/
public class CustomSignificanceHeuristicPlugin extends Plugin implements SearchPlugin {

/**
* Instantiate this plugin.
*/
public CustomSignificanceHeuristicPlugin() {};

@Override
public List<SignificanceHeuristicSpec<?>> getSignificanceHeuristics() {
return singletonList(new SignificanceHeuristicSpec<>(SimpleHeuristic.NAME, SimpleHeuristic::new, SimpleHeuristic.PARSER));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,25 @@
* A simple {@linkplain SignificanceHeuristic} used an example of declaring a custom heuristic.
*/
public class SimpleHeuristic extends SignificanceHeuristic {
/**
* The name of this NamedWriteable heuristic.
*/
public static final String NAME = "simple";

/**
* The parser with which to deserialize this object from XContent.
*/
public static final ObjectParser<SimpleHeuristic, Void> PARSER = new ObjectParser<>(NAME, SimpleHeuristic::new);

/**
* Instantiates this object.
*/
public SimpleHeuristic() {}

/**
* Read from a stream.
*
* @param in Input to read the value from
*/
public SimpleHeuristic(StreamInput in) throws IOException {
// Nothing to read
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/*
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/

/**
* Example classes demonstrating the use of a custom significance heuristic.
*/
package org.opensearch.example.customsigheuristic;
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@
import java.io.IOException;
import java.util.Locale;

/**
* A custom suggester supportiong suggestion-based search.
*/
public class CustomSuggester extends Suggester<CustomSuggestionContext> {

/**
* Instantiate this object.
*/
public CustomSuggester() {}

// This is a pretty dumb implementation which returns the original text + fieldName + custom config option + 12 or 123
@Override
public Suggest.Suggestion<? extends Suggest.Suggestion.Entry<? extends Suggest.Suggestion.Entry.Option>> innerExecute(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,16 @@
import java.util.Collections;
import java.util.List;

/**
* Plugin demonstrating custom suggestion-based search.
*/
public class CustomSuggesterPlugin extends Plugin implements SearchPlugin {

/**
* Instantiate this class.
*/
public CustomSuggesterPlugin() {}

@Override
public List<SearchPlugin.SuggesterSpec<?>> getSuggesters() {
return Collections.singletonList(
Expand Down
Loading

0 comments on commit 551bd1b

Please sign in to comment.