// result 1 is empty 
List<?> result1 = session.createQuery( "from Person e where e.id.firstName = 'Emmanuel'" ).list();

PersonPK emmanuelPk = new PersonPK();
emmanuelPk.setFirstName( "Emmanuel" );
emmanuelPk.setLastName( "Bernard" );

// result 2 corresponds to the correct entity
Object result2 = session.get(Person.class, emmanuelPk);

// result 3 corresponds to the correct entity - this was fixed by the pull request
List<?> result3 = session.createQuery( "from Person e where e.address.street = 'Penion Str.'" ).list();

@Override
public Neo4jQueryParsingResult getResult() {
	String targetAlias = embeddedAliasResolver.findAliasForType( targetTypeName );
	String label = getKeyMetaData( targetType ).getTable();
	StringBuilder queryBuilder = new StringBuilder();
	match( queryBuilder, targetAlias, label );
	where( queryBuilder );
	optionalMatch( queryBuilder, targetAlias );
	returns( queryBuilder, targetAlias );
	orderBy( queryBuilder );
	return new Neo4jQueryParsingResult( targetType, projections, queryBuilder.toString() );
}

@Embeddable
public class Address implements Serializable {

	private static final long serialVersionUID = 1L;

	private String street;
	private String city;

	public String getStreet() {
		return street;
	}

	public String getCity() {
		return city;
	}

	public void setStreet(String street) {
		this.street = street;
	}

	public void setCity(String city) {
		this.city = city;
	}

	@Override
	public boolean equals(Object o) {
		if ( this == o ) {
			return true;
		}
		if ( !( o instanceof Address ) ) {
			return false;
		}
		Address address = (Address) o;

		if ( street != null ? !street.equals( address.street ) : address.street != null ) {
			return false;
		}
		if ( city != null ? !city.equals( address.city ) : address.city != null ) {
			return false;
		}

		return true;
	}

	@Override
	public int hashCode() {
		int result;
		result = ( street != null ? street.hashCode() : 0 );
		result = 31 * result + ( city != null ? city.hashCode() : 0 );
		return result;
	}

}

@Entity
@Indexed
public class Person {

	@EmbeddedId
	@FieldBridge(impl = PersonPKBridge.class)
	@DocumentId
	private PersonPK id;

	private String favoriteColor;

	@Embedded
	private Address address;
	
	public PersonPK getId() {
		return id;
	}

	public void setId(PersonPK id) {
		this.id = id;
	}

	@Field
	public String getFavoriteColor() {
		return favoriteColor;
	}

	public void setFavoriteColor(String favoriteColor) {
		this.favoriteColor = favoriteColor;
	}

	public Address getAddress() {
		return address;
	}

	public void setAddress(Address address) {
		this.address = address;
	}
}