Added street address.

Added street, street no. and apartement no. in EN and PL versions to be generated in the addresssss.

Localised address string.

Added interface and implementation to provide localised address strings.

Import fix.

src/main/java/io/codearte/jfairy/producer/person/Address.java

@@ -3,11 +3,21 @@
 public class Address {
 
 	private final String postalCode;
+
 	private final String city;
 
-	public Address(String postalCode, String city) {
+	private final String street;
+
+	private final String streetNumber;
+
+	private final String apartmentNumber;
+
+	public Address(String postalCode, String city, String street, String streetNumber, String apartmentNumber) {
 		this.postalCode = postalCode;
 		this.city = city;
+		this.street = street;
+		this.streetNumber = streetNumber;
+		this.apartmentNumber = apartmentNumber;
 	}
 
 	public String getPostalCode() {
@@ -18,6 +28,18 @@ public String getCity() {
 		return city;
 	}
 
+	public String street() {
+		return street;
+	}
+
+	public String streetNumber() {
+		return streetNumber;
+	}
+
+	public String apartmentNumber() {
+		return apartmentNumber;
+	}
+
 	@Override
 	public String toString() {
 		return postalCode + " " + city;

src/main/java/io/codearte/jfairy/producer/person/AddressProvider.java

@@ -1,16 +1,21 @@
 package io.codearte.jfairy.producer.person;
 
-import com.google.inject.Inject;
 import com.google.inject.Provider;
 import io.codearte.jfairy.data.DataMaster;
 import io.codearte.jfairy.producer.BaseProducer;
 
-class AddressProvider implements Provider<Address> {
+import javax.inject.Inject;
+
+public class AddressProvider implements Provider<Address> {
 
 	private static final String POSTAL_CODE_FORMAT = "postal_code";
+
 	private static final String CITY = "city";
 
+	private static final String STREET = "street";
+
 	private final BaseProducer baseProducer;
+
 	private final DataMaster dataMaster;
 
 	@Inject
@@ -24,9 +29,12 @@ public Address get() {
 		String postalCodeFormat = dataMaster.getRandomValue(POSTAL_CODE_FORMAT);
 
 		String city = dataMaster.getRandomValue(CITY);
+		String street = dataMaster.getRandomValue(STREET);
 		String postalCode = baseProducer.numerify(postalCodeFormat);
+		String streetNumber = String.valueOf(baseProducer.randomInt(25));
+		String apartmentNumber = baseProducer.trueOrFalse() ? String.valueOf(baseProducer.randomInt(350)) : "";
 
-		return new Address(postalCode, city);
+		return new Address(postalCode, city, street, streetNumber, apartmentNumber);
 	}
 
 }

src/main/resources/jfairy_en.yml

@@ -20,6 +20,8 @@ data:
 
   postal_code: ['#####']
 
-  city: [New York, Washington]
+  city: [New York, Washington, San Francisco, Miami]
+
+  street: [Atkins Avenue, Aster Court, Cove Lane, Ford Street, Highland Place, Herzi Street, Tabor Court, Stillwell Avenue, Summer Place, Washington Walk]
 
   country: ['Canada', 'USA', 'Poland']

src/main/resources/jfairy_pl.yml

@@ -23,4 +23,6 @@ data:
 
   city: [Białystok, Bielsko-Biała, Bydgoszcz, Bytom, Chorzów, Częstochowa, Dąbrowa Górnicza, Elbląg, Gdańsk, Gdynia, Gliwice, Gorzów Wielkopolski, Grudziądz, Jastrzębie Zdrój, Jaworzno, Kalisz, Katowice, Kielce, Koszalin, Kraków, Legnica, Lublin, Łódź, Olsztyn, Opole, Poznań, Płock, Radom, Ruda Śląska, Rybnik, Rzeszów, Sosnowiec, Szczecin, Słupsk, Tarnów, Toruń, Tychy, Warszawa, Wałbrzych, Wrocław, Włocławek, Zabrze, Zielona Góra]
 
+  street: [Ogrodowa, A. Mickiewicza, Chłodna, Targowa, Prosta, Biała, Żelazna, Miedziana, Złota, Kacza, Browarna]
+
   country: ['Polska']