minor formatting work
This commit is contained in:
parent
3380dba316
commit
dffd5fd903
@ -19,8 +19,7 @@ public class ClientDao {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public String getClientName() {
|
public String getClientName() {
|
||||||
return this.jdbcTemplate.query(SQL_GET_CLIENT_NAME, rowMapper)
|
return this.jdbcTemplate.query(SQL_GET_CLIENT_NAME, rowMapper).get(0);
|
||||||
.get(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static RowMapper<String> rowMapper = (rs, rowNum) -> {
|
private static RowMapper<String> rowMapper = (rs, rowNum) -> {
|
||||||
|
@ -27,8 +27,7 @@ public class ExtendedRepositoryImpl<T, ID extends Serializable> extends SimpleJp
|
|||||||
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
|
CriteriaBuilder builder = entityManager.getCriteriaBuilder();
|
||||||
CriteriaQuery<T> query = builder.createQuery(getDomainClass());
|
CriteriaQuery<T> query = builder.createQuery(getDomainClass());
|
||||||
Root<T> root = query.from(getDomainClass());
|
Root<T> root = query.from(getDomainClass());
|
||||||
query.select(root)
|
query.select(root).where(builder.like(root.<String> get(attributeName), "%" + text + "%"));
|
||||||
.where(builder.like(root.<String> get(attributeName), "%" + text + "%"));
|
|
||||||
TypedQuery<T> q = entityManager.createQuery(query);
|
TypedQuery<T> q = entityManager.createQuery(query);
|
||||||
return q.getResultList();
|
return q.getResultList();
|
||||||
}
|
}
|
||||||
|
@ -7,7 +7,8 @@ public class KVTag {
|
|||||||
private String key;
|
private String key;
|
||||||
private String value;
|
private String value;
|
||||||
|
|
||||||
public KVTag(){}
|
public KVTag() {
|
||||||
|
}
|
||||||
|
|
||||||
public KVTag(String key, String value) {
|
public KVTag(String key, String value) {
|
||||||
super();
|
super();
|
||||||
|
@ -8,7 +8,8 @@ public class LocationTag {
|
|||||||
private int xPos;
|
private int xPos;
|
||||||
private int yPos;
|
private int yPos;
|
||||||
|
|
||||||
public LocationTag(){}
|
public LocationTag() {
|
||||||
|
}
|
||||||
|
|
||||||
public LocationTag(String name, int xPos, int yPos) {
|
public LocationTag(String name, int xPos, int yPos) {
|
||||||
super();
|
super();
|
||||||
|
@ -13,12 +13,11 @@ public class ManyStudent {
|
|||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
@ManyToMany(cascade = CascadeType.ALL)
|
@ManyToMany(cascade = CascadeType.ALL)
|
||||||
@JoinTable(name = "manystudent_manytags",
|
@JoinTable(name = "manystudent_manytags", joinColumns = @JoinColumn(name = "manystudent_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "manytag_id", referencedColumnName = "id"))
|
||||||
joinColumns = @JoinColumn(name = "manystudent_id", referencedColumnName = "id"),
|
|
||||||
inverseJoinColumns = @JoinColumn(name = "manytag_id", referencedColumnName = "id"))
|
|
||||||
private Set<ManyTag> manyTags = new HashSet<>();
|
private Set<ManyTag> manyTags = new HashSet<>();
|
||||||
|
|
||||||
public ManyStudent() {}
|
public ManyStudent() {
|
||||||
|
}
|
||||||
|
|
||||||
public ManyStudent(String name) {
|
public ManyStudent(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
@ -15,7 +15,8 @@ public class ManyTag {
|
|||||||
@ManyToMany(mappedBy = "manyTags")
|
@ManyToMany(mappedBy = "manyTags")
|
||||||
private Set<ManyStudent> students = new HashSet<>();
|
private Set<ManyStudent> students = new HashSet<>();
|
||||||
|
|
||||||
public ManyTag() {}
|
public ManyTag() {
|
||||||
|
}
|
||||||
|
|
||||||
public ManyTag(String name) {
|
public ManyTag(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
|
@ -7,7 +7,8 @@ public class SkillTag {
|
|||||||
private String name;
|
private String name;
|
||||||
private int value;
|
private int value;
|
||||||
|
|
||||||
public SkillTag(){}
|
public SkillTag() {
|
||||||
|
}
|
||||||
|
|
||||||
public SkillTag(String name, int value) {
|
public SkillTag(String name, int value) {
|
||||||
super();
|
super();
|
||||||
|
@ -20,12 +20,15 @@ public class Country {
|
|||||||
public Integer getId() {
|
public Integer getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setId(Integer id) {
|
public void setId(Integer id) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setName(String name) {
|
public void setName(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
@ -34,17 +34,11 @@ public class DataSourceRoutingTestConfiguration {
|
|||||||
|
|
||||||
private DataSource clientADatasource() {
|
private DataSource clientADatasource() {
|
||||||
EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
|
EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
|
||||||
return dbBuilder.setType(EmbeddedDatabaseType.H2)
|
return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_A").addScript("classpath:dsrouting-db.sql").build();
|
||||||
.setName("CLIENT_A")
|
|
||||||
.addScript("classpath:dsrouting-db.sql")
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private DataSource clientBDatasource() {
|
private DataSource clientBDatasource() {
|
||||||
EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
|
EmbeddedDatabaseBuilder dbBuilder = new EmbeddedDatabaseBuilder();
|
||||||
return dbBuilder.setType(EmbeddedDatabaseType.H2)
|
return dbBuilder.setType(EmbeddedDatabaseType.H2).setName("CLIENT_B").addScript("classpath:dsrouting-db.sql").build();
|
||||||
.setName("CLIENT_B")
|
|
||||||
.addScript("classpath:dsrouting-db.sql")
|
|
||||||
.build();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -117,9 +117,7 @@ public class DeletionIntegrationTest {
|
|||||||
entityManager.persist(foo);
|
entityManager.persist(foo);
|
||||||
flushAndClear();
|
flushAndClear();
|
||||||
|
|
||||||
entityManager.createQuery("delete from Foo where id = :id")
|
entityManager.createQuery("delete from Foo where id = :id").setParameter("id", foo.getId()).executeUpdate();
|
||||||
.setParameter("id", foo.getId())
|
|
||||||
.executeUpdate();
|
|
||||||
|
|
||||||
assertThat(entityManager.find(Foo.class, foo.getId()), nullValue());
|
assertThat(entityManager.find(Foo.class, foo.getId()), nullValue());
|
||||||
}
|
}
|
||||||
@ -131,9 +129,7 @@ public class DeletionIntegrationTest {
|
|||||||
entityManager.persist(foo);
|
entityManager.persist(foo);
|
||||||
flushAndClear();
|
flushAndClear();
|
||||||
|
|
||||||
entityManager.createNativeQuery("delete from FOO where ID = :id")
|
entityManager.createNativeQuery("delete from FOO where ID = :id").setParameter("id", foo.getId()).executeUpdate();
|
||||||
.setParameter("id", foo.getId())
|
|
||||||
.executeUpdate();
|
|
||||||
|
|
||||||
assertThat(entityManager.find(Foo.class, foo.getId()), nullValue());
|
assertThat(entityManager.find(Foo.class, foo.getId()), nullValue());
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user