Merge remote-tracking branch 'origin/correlation_field_mapping' into …

…correlation_field_mapping Signed-off-by: YANGDB <[email protected]> # Conflicts: # server/src/internalClusterTest/java/org/opensearch/search/fieldcaps/FieldCapabilitiesIT.java
opensearch-project · Jul 18, 2023 · 5ea7507 · 5ea7507
2 parents 186239f + ac90fc5
commit 5ea7507
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilities.java b/server/src/main/java/org/opensearch/action/fieldcaps/FieldCapabilities.java
@@ -286,8 +286,6 @@ public String[] indices() {
 
     /**
      * the list of aliases where this filed is referenced within (referenced by the `path` alias attribute)
-     *
-     * @return
      */
     public String[] aliases() {
         return aliases;

diff --git a/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java b/server/src/main/java/org/opensearch/index/mapper/FieldTypeLookup.java
@@ -133,8 +133,6 @@ public List<String> getAliases(String field) {
 
     /**
      * returns whether is field name is an alias for another field
-     * @param field
-     * @return
      */
     public boolean isAlias(String field) {
         return aliasToConcreteName.containsKey(field);