Revert "Ingest node - user agent, move device to an object (elastic#38115)"

This reverts commit 5b008a3.

Related: elastic/beats#10650

Will replace this commit with the 6.7 version

Author: jakelandis

docs/reference/ingest/processors/user-agent.asciidoc

@@ -67,9 +67,7 @@ Which returns
         "version": "10.10.5",
         "full": "Mac OS X 10.10.5"
       },
-      "device" : {
-        "name" : "Other"
-      },
+      "device": "Other"
     }
   }
 }

modules/ingest-user-agent/src/main/java/org/elasticsearch/ingest/useragent/UserAgentProcessor.java

@@ -134,13 +134,11 @@ public IngestDocument execute(IngestDocument ingestDocument) {
                     }
                     break;
                 case DEVICE:
-                    Map<String, String> deviceDetails = new HashMap<>(1);
                     if (uaClient.device != null && uaClient.device.name != null) {
-                        deviceDetails.put("name", uaClient.device.name);
+                        uaDetails.put("device", uaClient.device.name);
                     } else {
-                        deviceDetails.put("name", "Other");
+                        uaDetails.put("device", "Other");
                     }
-                    uaDetails.put("device", deviceDetails);
                     break;
             }
         }

modules/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/UserAgentProcessorTests.java

@@ -110,9 +110,7 @@ public void testCommonBrowser() throws Exception {
         os.put("version", "10.9.2");
         os.put("full", "Mac OS X 10.9.2");
         assertThat(target.get("os"), is(os));
-        Map<String, String> device = new HashMap<>();
-        device.put("name", "Other");
-        assertThat(target.get("device"), is(device));
+        assertThat(target.get("device"), is("Other"));
     }
 
     @SuppressWarnings("unchecked")
@@ -138,9 +136,7 @@ public void testUncommonDevice() throws Exception {
         os.put("full", "Android 3.0");
         assertThat(target.get("os"), is(os));
 
-        Map<String, String> device = new HashMap<>();
-        device.put("name", "Motorola Xoom");
-        assertThat(target.get("device"), is(device));
+        assertThat(target.get("device"), is("Motorola Xoom"));
     }
 
     @SuppressWarnings("unchecked")
@@ -161,9 +157,7 @@ public void testSpider() throws Exception {
         assertNull(target.get("version"));
         assertNull(target.get("os"));
 
-        Map<String, String> device = new HashMap<>();
-        device.put("name", "Spider");
-        assertThat(target.get("device"), is(device));
+        assertThat(target.get("device"), is("Spider"));
     }
 
     @SuppressWarnings("unchecked")
@@ -186,8 +180,7 @@ public void testUnknown() throws Exception {
         assertNull(target.get("build"));
 
         assertNull(target.get("os"));
-        Map<String, String> device = new HashMap<>();
-        device.put("name", "Other");
-        assertThat(target.get("device"), is(device));
+
+        assertThat(target.get("device"), is("Other"));
     }
 }

modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml

@@ -32,7 +32,7 @@
   - match: { _source.user_agent.original: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.149 Safari/537.36" }
   - match: { _source.user_agent.os: {"name":"Mac OS X", "version":"10.9.2", "full":"Mac OS X 10.9.2"} }
   - match: { _source.user_agent.version: "33.0.1750" }
-  - match: { _source.user_agent.device: {"name": "Other" }}
+  - match: { _source.user_agent.device: "Other" }
 
 ---
 "Test user agent processor with parameters":

modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml

@@ -30,6 +30,6 @@
         id: 1
   - match: { _source.field1: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.149 Safari/537.36" }
   - match: { _source.user_agent.name: "Test" }
-  - match: { _source.user_agent.device: {"name": "Other" }}
+  - match: { _source.user_agent.device: "Other" }
   - is_false: _source.user_agent.os
   - is_false: _source.user_agent.version