Commit 72686a4

author

Rajeev Kumar Singh

committed

cleanup

1 parent ad6af1b commit 72686a4Copy full SHA for 72686a4

File tree

+22

-11

lines changed

hibernate-element-collection-demo/src/main/java/com/example/hibernate
- HibernateElementCollectionDemoApplication.java
- model
  - Address.java
  - User.java
hibernate-embeddable-demo/src/main/java/com/example/hibernate/model
- User.java

+22

-11

lines changed

Lines changed: 10 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,17 +23,22 @@ public static void main(String[] args) {`
`23`	`23`
`24`	`24`	`@Override`
`25`	`25`	`public void run(String... args) throws Exception {`
`26`		`- userRepository.deleteAllInBatch();`
	`26`	`+ // Cleanup database tables.`
	`27`	`+ userRepository.deleteAll();`
`27`	`28`
`28`		`- Set<String> phoneNumbers = new HashSet<>();`
	`29`	`+ // Insert a user with multiple phone numbers and addresses.`
	`30`	`+ Set<String> phoneNumbers = new HashSet<>();`
`29`	`31`	`phoneNumbers.add("+91-9999999999");`
`30`	`32`	`phoneNumbers.add("+91-9898989898");`
`31`	`33`
`32`	`34`	`Set<Address> addresses = new HashSet<>();`
`33`		`- addresses.add(new Address("747", "Golf View Road", "Kodihalli", "Bangalore", "India", "560008"));`
`34`		`- addresses.add(new Address("Tower C", "Diamong District", "Domlur", "Bangalore", "India", "560008"));`
	`35`	`+ addresses.add(new Address("747", "Golf View Road", "Bangalore",`
	`36`	`+ "Karnataka", "India", "560008"));`
	`37`	`+ addresses.add(new Address("Plot No 44", "Electronic City", "Bangalore",`
	`38`	`+ "Karnataka", "India", "560001"));`
`35`	`39`
`36`		`- User user = new User("Rajeev Kumar Singh", "rajeevs@flock.com", phoneNumbers, addresses);`
	`40`	`+ User user = new User("Rajeev Kumar Singh", "rajeev@callicoder.com",`
	`41`	`+ phoneNumbers, addresses);`
`37`	`42`
`38`	`43`	`userRepository.save(user);`
`39`	`44`	`}`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,27 +2,35 @@`
`2`	`2`
`3`	`3`	`import javax.persistence.Embeddable;`
`4`	`4`	`import javax.validation.constraints.NotNull;`
	`5`	`+import javax.validation.constraints.Size;`
`5`	`6`
`6`	`7`	`/**`
`7`	`8`	`* Created by rajeevkumarsingh on 22/11/17.`
`8`	`9`	`*/`
`9`	`10`	`@Embeddable`
`10`	`11`	`public class Address {`
`11`	`12`	`@NotNull`
	`13`	`+ @Size(max = 100)`
`12`	`14`	`private String addressLine1;`
`13`	`15`
	`16`	`+ @NotNull`
	`17`	`+ @Size(max = 100)`
`14`	`18`	`private String addressLine2;`
`15`	`19`
`16`	`20`	`@NotNull`
	`21`	`+ @Size(max = 100)`
`17`	`22`	`private String city;`
`18`	`23`
`19`	`24`	`@NotNull`
	`25`	`+ @Size(max = 100)`
`20`	`26`	`private String state;`
`21`	`27`
`22`	`28`	`@NotNull`
	`29`	`+ @Size(max = 100)`
`23`	`30`	`private String country;`
`24`	`31`
`25`	`32`	`@NotNull`
	`33`	`+ @Size(max = 100)`
`26`	`34`	`private String zipCode;`
`27`	`35`
`28`	`36`	`public Address() {`

Lines changed: 3 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`import org.hibernate.validator.constraints.Email;`
`4`	`4`
`5`	`5`	`import javax.persistence.*;`
`6`		`-import javax.validation.Valid;`
`7`	`6`	`import javax.validation.constraints.NotNull;`
`8`	`7`	`import javax.validation.constraints.Size;`
`9`	`8`	`import java.util.HashSet;`
`@@ -33,12 +32,11 @@ public class User {`
`33`	`32`	`@Column(name = "phone_number")`
`34`	`33`	`private Set<String> phoneNumbers = new HashSet<>();`
`35`	`34`
`36`		`- @Valid`
`37`		`- @ElementCollection`
	`35`	`+ @ElementCollection(fetch = FetchType.LAZY)`
`38`	`36`	`@CollectionTable(name = "user_addresses", joinColumns = @JoinColumn(name = "user_id"))`
`39`	`37`	`@AttributeOverrides({`
`40`		`- @AttributeOverride(name = "addressLine1", column = @Column(name = "address1")),`
`41`		`- @AttributeOverride(name = "addressLine2", column = @Column(name = "address2"))`
	`38`	`+ @AttributeOverride(name = "addressLine1", column = @Column(name = "house_number")),`
	`39`	`+ @AttributeOverride(name = "addressLine2", column = @Column(name = "street"))`
`42`	`40`	`})`
`43`	`41`	`private Set<Address> addresses = new HashSet<>();`
`44`	`42`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public class User {`
`25`	`25`
`26`	`26`	`@Embedded`
`27`	`27`	`@AttributeOverrides(value = {`
`28`		`- @AttributeOverride(name = "addressLine1", column = @Column(name = "houseNumber")),`
	`28`	`+ @AttributeOverride(name = "addressLine1", column = @Column(name = "house_number")),`
`29`	`29`	`@AttributeOverride(name = "addressLine2", column = @Column(name = "street"))`
`30`	`30`	`})`
`31`	`31`	`private Address address;`

Comments

(0)