Skip to content

Commit 7218ed2

Browse files
authored
Using vars everywhere (#518)
2 parents 04f0a48 + fef8ca6 commit 7218ed2

File tree

1,239 files changed

+9910
-7299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,239 files changed

+9910
-7299
lines changed

querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/Tweet.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.querydsl.example.jpa.model;
22

3-
import jakarta.persistence.*;
3+
import jakarta.persistence.Entity;
4+
import jakarta.persistence.FetchType;
5+
import jakarta.persistence.ManyToMany;
6+
import jakarta.persistence.ManyToOne;
7+
import jakarta.persistence.Table;
48
import java.util.ArrayList;
59
import java.util.List;
610

@@ -13,7 +17,7 @@ public class Tweet extends BaseEntity {
1317
private User poster;
1418

1519
@ManyToMany(fetch = FetchType.EAGER)
16-
private List<User> mentions = new ArrayList<User>();
20+
private List<User> mentions = new ArrayList<>();
1721

1822
@ManyToOne private Location location;
1923

querydsl-examples/querydsl-example-jpa-guice/src/main/java/com/querydsl/example/jpa/model/User.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package com.querydsl.example.jpa.model;
22

3-
import jakarta.persistence.*;
3+
import jakarta.persistence.Column;
4+
import jakarta.persistence.Entity;
5+
import jakarta.persistence.FetchType;
6+
import jakarta.persistence.OneToMany;
7+
import jakarta.persistence.Table;
48
import java.util.HashSet;
59
import java.util.Set;
610

@@ -11,7 +15,7 @@ public class User extends BaseEntity {
1115
private String username;
1216

1317
@OneToMany(fetch = FetchType.LAZY, mappedBy = "poster")
14-
private Set<Tweet> tweets = new HashSet<Tweet>();
18+
private Set<Tweet> tweets = new HashSet<>();
1519

1620
public User() {}
1721

querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/AbstractPersistenceTest.java

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import jakarta.inject.Provider;
77
import jakarta.persistence.EntityManager;
88
import java.sql.Connection;
9-
import java.sql.DatabaseMetaData;
10-
import java.sql.ResultSet;
119
import java.sql.SQLException;
1210
import java.util.ArrayList;
1311
import java.util.List;
@@ -23,16 +21,16 @@ public abstract class AbstractPersistenceTest {
2321
@Before
2422
@Transactional
2523
public void before() {
26-
EntityManager entityManager = em.get();
24+
var entityManager = em.get();
2725
entityManager.getEntityManagerFactory().getCache().evictAll();
28-
Session session = entityManager.unwrap(Session.class);
26+
var session = entityManager.unwrap(Session.class);
2927
session.doWork(
3028
new Work() {
3129
@Override
3230
public void execute(Connection connection) throws SQLException {
33-
List<String> tables = new ArrayList<String>();
34-
DatabaseMetaData md = connection.getMetaData();
35-
ResultSet rs = md.getTables(null, "PUBLIC", null, new String[] {"TABLE"});
31+
List<String> tables = new ArrayList<>();
32+
var md = connection.getMetaData();
33+
var rs = md.getTables(null, "PUBLIC", null, new String[] {"TABLE"});
3634
try {
3735
while (rs.next()) {
3836
tables.add(rs.getString("TABLE_NAME"));
@@ -41,7 +39,7 @@ public void execute(Connection connection) throws SQLException {
4139
rs.close();
4240
}
4341

44-
try (java.sql.Statement stmt = connection.createStatement()) {
42+
try (var stmt = connection.createStatement()) {
4543
stmt.execute("SET REFERENTIAL_INTEGRITY FALSE");
4644
for (String table : tables) {
4745
stmt.execute("TRUNCATE TABLE " + table);

querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/TweetRepositoryTest.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ public class TweetRepositoryTest extends AbstractPersistenceTest {
1919

2020
@Test
2121
public void save_and_find_by_id() {
22-
User poster = new User("dr_frank");
22+
var poster = new User("dr_frank");
2323
userRepository.save(poster);
2424

25-
String content = "I am alive! #YOLO";
26-
Tweet tweet = new Tweet(poster, content, Collections.<User>emptyList(), null);
25+
var content = "I am alive! #YOLO";
26+
var tweet = new Tweet(poster, content, Collections.<User>emptyList(), null);
2727
repository.save(tweet);
2828
assertThat(repository.findById(tweet.getId()).getContent()).isEqualTo(content);
2929
}
3030

3131
@Test
3232
public void find_list_by_predicate() {
33-
User poster = new User("dr_frank");
33+
var poster = new User("dr_frank");
3434
userRepository.save(poster);
3535

3636
repository.save(new Tweet(poster, "It is a alive! #YOLO", Collections.<User>emptyList(), null));
@@ -41,7 +41,7 @@ public void find_list_by_predicate() {
4141

4242
@Test
4343
public void find_list_by_predicate_with_hibernate() {
44-
User poster = new User("dr_frank");
44+
var poster = new User("dr_frank");
4545
userRepository.save(poster);
4646

4747
repository.save(new Tweet(poster, "It is a alive! #YOLO", Collections.<User>emptyList(), null));
@@ -57,9 +57,9 @@ public void find_list_by_complex_predicate() {
5757
for (String username : usernames) {
5858
users.add(userRepository.save(new User(username)));
5959
}
60-
User poster = new User("duplo");
60+
var poster = new User("duplo");
6161
userRepository.save(poster);
62-
for (int i = 0; i < 100; i++) {
62+
for (var i = 0; i < 100; i++) {
6363
repository.save(new Tweet(poster, "spamming @dr_frank " + i, users.subList(0, 1), null));
6464
}
6565
assertThat(repository.findAll(tweet.mentions.contains(users.get(1)))).isEmpty();
@@ -78,9 +78,9 @@ public void find_list_by_complex_predicate_hibernate() {
7878
for (String username : usernames) {
7979
users.add(userRepository.save(new User(username)));
8080
}
81-
User poster = new User("duplo");
81+
var poster = new User("duplo");
8282
userRepository.save(poster);
83-
for (int i = 0; i < 100; i++) {
83+
for (var i = 0; i < 100; i++) {
8484
repository.save(new Tweet(poster, "spamming @dr_frank " + i, users.subList(0, 1), null));
8585
}
8686
assertThat(repository.findAllWithHibernateQuery(tweet.mentions.contains(users.get(1))))

querydsl-examples/querydsl-example-jpa-guice/src/test/java/com/querydsl/example/jpa/repository/UserRepositoryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public class UserRepositoryTest extends AbstractPersistenceTest {
1111

1212
@Test
1313
public void save_and_get_by_id() {
14-
String username = "jackie";
15-
User user = new User(username);
14+
var username = "jackie";
15+
var user = new User(username);
1616
repository.save(user);
1717
assertThat(repository.findById(user.getId()).getUsername()).isEqualTo(username);
1818
}

querydsl-examples/querydsl-example-jpa-quarkus/src/main/java/com/querydsl/example/FruitResource.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.querydsl.example;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
4-
import com.fasterxml.jackson.databind.node.ObjectNode;
54
import com.querydsl.jpa.impl.JPAQueryFactory;
65
import jakarta.enterprise.context.ApplicationScoped;
76
import jakarta.inject.Inject;
@@ -48,7 +47,7 @@ public List<Fruit> get() {
4847
@GET
4948
@Path("{id}")
5049
public Fruit getSingle(Integer id) {
51-
Fruit entity = queryFactory.selectFrom(f).where(f.id.eq(id)).fetchOne();
50+
var entity = queryFactory.selectFrom(f).where(f.id.eq(id)).fetchOne();
5251
if (entity == null) {
5352
throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
5453
}
@@ -74,7 +73,7 @@ public Fruit update(Integer id, Fruit fruit) {
7473
throw new WebApplicationException("Fruit Name was not set on request.", 422);
7574
}
7675

77-
Fruit entity = getSingle(id);
76+
var entity = getSingle(id);
7877
entity.setName(fruit.getName());
7978

8079
return entity;
@@ -84,7 +83,7 @@ public Fruit update(Integer id, Fruit fruit) {
8483
@Path("{id}")
8584
@Transactional
8685
public Response delete(Integer id) {
87-
long modified = queryFactory.delete(f).where(f.id.eq(id)).execute();
86+
var modified = queryFactory.delete(f).where(f.id.eq(id)).execute();
8887
if (modified == 0L) {
8988
throw new WebApplicationException("Fruit with id of " + id + " does not exist.", 404);
9089
}
@@ -100,12 +99,12 @@ public static class ErrorMapper implements ExceptionMapper<Exception> {
10099
public Response toResponse(Exception exception) {
101100
LOGGER.error("Failed to handle request", exception);
102101

103-
int code = 500;
102+
var code = 500;
104103
if (exception instanceof WebApplicationException applicationException) {
105104
code = applicationException.getResponse().getStatus();
106105
}
107106

108-
ObjectNode exceptionJson = objectMapper.createObjectNode();
107+
var exceptionJson = objectMapper.createObjectNode();
109108
exceptionJson.put("exceptionType", exception.getClass().getName());
110109
exceptionJson.put("code", code);
111110

querydsl-examples/querydsl-example-jpa-spring/src/main/java/com/querydsl/example/AccessingDataJpaApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public CommandLineRunner demo(CustomerRepository repository) {
3838
log.info("");
3939

4040
// fetch an individual customer by ID
41-
Customer customer = repository.findById(1L);
41+
var customer = repository.findById(1L);
4242
log.info("Customer found with findById(1L):");
4343
log.info("--------------------------------");
4444
log.info(customer.toString());

querydsl-examples/querydsl-example-jpa-spring/src/main/java/com/querydsl/example/Config.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,11 @@ public PlatformTransactionManager transactionManager() throws SQLException {
4646
@Bean
4747
public AbstractEntityManagerFactoryBean entityManagerFactory() throws SQLException {
4848

49-
HibernateJpaVendorAdapter jpaVendorAdapter = new HibernateJpaVendorAdapter();
49+
var jpaVendorAdapter = new HibernateJpaVendorAdapter();
5050
jpaVendorAdapter.setDatabase(Database.H2);
5151
jpaVendorAdapter.setGenerateDdl(true);
5252

53-
LocalContainerEntityManagerFactoryBean bean = new LocalContainerEntityManagerFactoryBean();
53+
var bean = new LocalContainerEntityManagerFactoryBean();
5454
bean.setJpaVendorAdapter(jpaVendorAdapter);
5555
bean.setPackagesToScan(Config.class.getPackage().getName());
5656
bean.setDataSource(dataSource());

querydsl-examples/querydsl-example-jpa-spring/src/main/java/com/querydsl/example/CustomerRepository.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ default Customer findById(long id) {
1515
return select(C).from(C).where(C.id.eq(id)).fetchOne();
1616
}
1717

18+
@Override
1819
default List<Customer> findAll() {
1920
return select(C).from(C).fetch();
2021
}

querydsl-examples/querydsl-example-jpa-spring/src/test/java/com/querydsl/example/CustomerRepositoryTests.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import static org.assertj.core.api.Assertions.assertThat;
2020

21-
import java.util.List;
2221
import org.junit.jupiter.api.Test;
2322
import org.junit.jupiter.api.extension.ExtendWith;
2423
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,10 +32,10 @@ public class CustomerRepositoryTests {
3332

3433
@Test
3534
public void testFindByLastName() {
36-
Customer customer = new Customer("first", "last");
35+
var customer = new Customer("first", "last");
3736
customers.save(customer);
3837

39-
List<Customer> findByLastName = customers.findByLastName(customer.getLastName());
38+
var findByLastName = customers.findByLastName(customer.getLastName());
4039

4140
assertThat(findByLastName)
4241
.extracting(Customer::getLastName)

0 commit comments

Comments
 (0)