Correctly mapping complex shortcuts

[l-trotta]

Currently, shortcuts only work when the alternative syntax holds a string value, for example TermQuery. We found out that there are some requests with more complex shortcuts that allow to "skip" a level of the structure, for example:

• RankEvalQuery: supports both this extended form:

  {
  "metric": {...},
  "requests": [
    {
      "id": "id",
      "request": {
        "query": {
          "match": {...}
       }
      },
      "ratings": [...]
    }
  ]
  }

  and the shortcut version, where query is skipped

  {
  "metric": {...},
  "requests": [
    {
      "id": "id",
      "request": {
          "match": {...}
      },
      "ratings": [...]
    }
  ]
  }

• FunctionScoreQuery, where, similarly, functions can be skipped:

  {
  "query": {
    "function_score": {
      "functions": [
        {
          "gauss": {...}
        }
      ]
    }
  }
  }

  {
  "query": {
    "function_score": {
      "gauss": {...}
    }
  }
  }

Currently the java generator has no way of supporting the deserialization of these complex shortcut, not sure about the other clients. We can start by adding the correct shortcut annotation to these classes, but we should also make sure that we actually support it.

[Anaethelion]

Settings @shortcut_propery works for me on RankEvalQuery as a shortcut to Query. @flobernd, @JoshMock does adding this works for you ?

[flobernd]

The .NET generator currently ignores shortcut properties completely. Feel free to add it here 🙂 I have to come up with a strategy to detect these cases when I work on supporting the shortcuts.

[JoshMock]

@Anaethelion I believe this should work for JS as well. :+1: