Move new address api to AddressApiController

Author: Sandra Thieme

src/main/java/net/contargo/iris/address/api/AddressApiController.java

@@ -39,6 +39,8 @@
 
 import static org.springframework.hateoas.mvc.ControllerLinkBuilder.linkTo;
 
+import static org.springframework.web.bind.annotation.RequestMethod.GET;
+
 import static java.util.Collections.singletonList;
 
 
@@ -49,12 +51,14 @@
  * @author  Aljona Murygina - murygina@synyx.de
  * @author  Arnold Franke - franke@synyx.de
  * @author  Tobias Schneider - schneider@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Ben Antony - antony@synyx.de
  */
 @Controller
 @Api(description = "API for querying addresses.", value = "")
 public class AddressApiController {
 
-    public static final String METHOD_ADDRESS_BY_GEOLOCATION = "addressByGeolocation";
+    private static final String METHOD_ADDRESS_BY_GEOLOCATION = "addressByGeolocation";
     private static final Logger LOG = getLogger(MethodHandles.lookup().lookupClass());
 
     private final AddressDtoService addressDtoService;
@@ -188,4 +192,16 @@ public List<AddressDto> addressesWherePlaceIsIn(
 
         return addressDtoService.getAddressesWherePlaceIsIn(placeId);
     }
+
+
+    @ApiOperation(
+        value = "Returns a list of matching addresses.",
+        notes = "Can be static addresses or nominatim resolved addresses."
+    )
+    @ModelAttribute("addresses")
+    @RequestMapping(value = "/addresses", method = GET, params = { "query" })
+    public List<AddressDto> getAddresses(@RequestParam("query") String query) {
+
+        return addressDtoService.getAddressesByQuery(query);
+    }
 }

src/main/java/net/contargo/iris/address/api/SimpleAddressApiController.java

@@ -58,6 +58,8 @@
  * MVC Unit test of {@link AddressApiController}.
  *
  * @author  Arnold Franke - franke@synyx.de
+ * @author  Sandra Thieme - thieme@synyx.de
+ * @author  Ben Antony - antony@synyx.de
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = { "classpath:public-api-context.xml" })
@@ -209,4 +211,20 @@ public void testAddressByPlaceId() throws Exception {
             .andExpect(content().contentType("application/json"))
             .andExpect(jsonPath("$.addresses[0].displayName", is("76137 Karlsruhe")));
     }
+
+
+    @Test
+    public void getAddresses() throws Exception {
+
+        Address address = new Address();
+        address.setDisplayName("Gartenstr. 67, Karlsruhe (Südweststadt)");
+
+        when(addressDtoServiceMock.getAddressesByQuery("Gartenstraße 67, Karlsruhe")).thenReturn(singletonList(
+                new AddressDto(address)));
+
+        mockMvc.perform(get("/addresses").param("query", "Gartenstraße 67, Karlsruhe"))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.addresses", hasSize(1)))
+            .andExpect(jsonPath("$.addresses[0].displayName", is("Gartenstr. 67, Karlsruhe (Südweststadt)")));
+    }
 }