spring-projects#313 - Polishing.

Tweaking indentation in pom.xml to use tabs. Switch to upgrade to Spring Data release train Lovelace to simplify dependency declarations. Import order. Copyright years. Formatting. Original pull request: spring-projects#324.
chenzeweishare · Feb 22, 2018 · 74d947e · 74d947e
1 parent 5d556d6
commit 74d947e
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 140 deletions.
diff --git a/jdbc/basics/pom.xml b/jdbc/basics/pom.xml
@@ -13,4 +13,5 @@
 
 	<name>Spring Data JDBC - Basic usage examples</name>
 	<description>Sample project demonstrating Spring Data JDBC features</description>
+
 </project>
diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AgeGroup.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/AgeGroup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java b/...basics/src/main/java/example/springdata/jdbc/basics/aggregate/AggregateConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,14 @@
  */
 package example.springdata.jdbc.basics.aggregate;
 
+import java.sql.Clob;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.sql.DataSource;
+
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -24,21 +32,16 @@
 import org.springframework.data.jdbc.core.DelegatingDataAccessStrategy;
 import org.springframework.data.jdbc.core.SqlGeneratorSource;
 import org.springframework.data.jdbc.mapping.event.BeforeSave;
-import org.springframework.data.jdbc.mapping.model.*;
+import org.springframework.data.jdbc.mapping.model.ConversionCustomizer;
+import org.springframework.data.jdbc.mapping.model.DefaultNamingStrategy;
+import org.springframework.data.jdbc.mapping.model.JdbcMappingContext;
+import org.springframework.data.jdbc.mapping.model.JdbcPersistentProperty;
+import org.springframework.data.jdbc.mapping.model.NamingStrategy;
 import org.springframework.data.jdbc.repository.config.EnableJdbcRepositories;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder;
-import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType;
 import org.springframework.lang.Nullable;
 
-import javax.sql.DataSource;
-import java.sql.Clob;
-import java.sql.SQLException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicInteger;
-
 /**
  * @author Jens Schauder
  */
@@ -54,14 +57,17 @@ public ApplicationListener<?> idSetting() {
 		return (ApplicationListener<BeforeSave>) event -> {
 
 			Object entity = event.getEntity();
+
 			if (entity instanceof LegoSet) {
 
 				LegoSet legoSet = (LegoSet) entity;
+
 				if (legoSet.getId() == 0) {
 					legoSet.setId(id.incrementAndGet());
 				}
 
 				Manual manual = legoSet.getManual();
+
 				if (manual != null) {
 					manual.setId((long) legoSet.getId());
 				}
@@ -98,8 +104,7 @@ public String getColumnName(JdbcPersistentProperty property) {
 
 			@Override
 			public String getTableName(Class<?> type) {
-
-				return tableAliases.computeIfAbsent(super.getTableName(type),key -> key);
+				return tableAliases.computeIfAbsent(super.getTableName(type), key -> key);
 			}
 
 			@Override
@@ -128,6 +133,7 @@ public String convert(Clob clob) {
 					return Math.toIntExact(clob.length()) == 0 //
 							? "" //
 							: clob.getSubString(1, Math.toIntExact(clob.length()));
+
 				} catch (SQLException e) {
 					throw new IllegalStateException("Failed to convert CLOB to String.", e);
 				}
@@ -140,7 +146,6 @@ public String convert(Clob clob) {
 	DataAccessStrategy defaultDataAccessStrategy(JdbcMappingContext context, DataSource dataSource) {
 
 		NamedParameterJdbcOperations operations = new NamedParameterJdbcTemplate(dataSource);
-
 		DelegatingDataAccessStrategy accessStrategy = new DelegatingDataAccessStrategy();
 
 		accessStrategy.setDelegate(new DefaultDataAccessStrategy( //

diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/LegoSet.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/LegoSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,16 +16,17 @@
 package example.springdata.jdbc.basics.aggregate;
 
 import lombok.Data;
-import org.springframework.data.annotation.AccessType;
-import org.springframework.data.annotation.AccessType.Type;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Transient;
 
 import java.time.Period;
 import java.time.temporal.ChronoUnit;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.data.annotation.AccessType;
+import org.springframework.data.annotation.AccessType.Type;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+
 /**
  * A Lego Set consisting of multiple Blocks and a manual
  *
@@ -35,25 +36,21 @@
 @AccessType(Type.PROPERTY)
 public class LegoSet {
 
-	@Id
-	private int id;
-
+	private @Id int id;
 	private String name;
-
-	@Transient
-	private Period minimumAge;
-	@Transient
-	private Period maximumAge;
+	private @Transient Period minimumAge, maximumAge;
 
 	/**
-	 * Since Manuals are part of a {@link LegoSet} and only make sense inside a {@link LegoSet} it is considered part of the Aggregate.
+	 * Since Manuals are part of a {@link LegoSet} and only make sense inside a {@link LegoSet} it is considered part of
+	 * the Aggregate.
 	 */
 	private Manual manual;
 
 	// You can build multiple models from one LegoSet
 	private final Map<String, Model> models = new HashMap<>();
 
-	// conversion for custom types currently has to be done through getters/setter + marking the underlying property with @Transient.
+	// conversion for custom types currently has to be done through getters/setter + marking the underlying property with
+	// @Transient.
 	public int getIntMinimumAge() {
 		return toInt(this.minimumAge);
 	}
@@ -70,7 +67,6 @@ public void setIntMaximumAge(int years) {
 		maximumAge = toPeriod(years);
 	}
 
-
 	private static int toInt(Period period) {
 		return (int) (period == null ? 0 : period.get(ChronoUnit.YEARS));
 	}
@@ -84,6 +80,7 @@ public void addModel(String name, String description) {
 		Model model = new Model();
 		model.name = name;
 		model.description = description;
+
 		models.put(name, model);
 	}
 }
diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/LegoSetRepository.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/LegoSetRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@
 
 /**
  * A repository for {@link LegoSet}.
+ *
  * @author Jens Schauder
  */
-public interface LegoSetRepository extends CrudRepository<LegoSet, Integer> {
-
-}
+interface LegoSetRepository extends CrudRepository<LegoSet, Integer> {}
diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Manual.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package example.springdata.jdbc.basics.aggregate;
 
-import org.springframework.data.annotation.Id;
-
 import lombok.Data;
 
+import org.springframework.data.annotation.Id;
+
 /**
  * A manual instructing how to assemble a {@link LegoSet}.
  *
@@ -27,17 +27,13 @@
 @Data
 public class Manual {
 
+	private @Id Long id;
+	private String author, text;
 
 	Manual(String text, String author) {
 
 		this.id = null;
 		this.author = author;
 		this.text = text;
 	}
-
-	@Id
-	private Long id;
-
-	private String author;
-	private String text;
 }
diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Model.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/aggregate/Model.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,20 +16,17 @@
 package example.springdata.jdbc.basics.aggregate;
 
 import lombok.ToString;
+
 import org.springframework.data.annotation.Id;
 
 /**
- * One of potentially multiple models that can be build from a single {@link LegoSet}.
- *
- * No getters or setters needed.
+ * One of potentially multiple models that can be build from a single {@link LegoSet}. No getters or setters needed.
  *
  * @author Jens Schauder
  */
 @ToString
 public class Model {
 
-	@Id
-	String name;
-
+	@Id String name;
 	String description;
 }
diff --git a/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java b/jdbc/basics/src/main/java/example/springdata/jdbc/basics/simpleentity/Category.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  */
 package example.springdata.jdbc.basics.simpleentity;
 
-import java.time.LocalDateTime;
-
 import example.springdata.jdbc.basics.aggregate.AgeGroup;
 import example.springdata.jdbc.basics.aggregate.LegoSet;
-import org.springframework.data.annotation.Id;
-
 import lombok.Data;
 import lombok.Setter;
 
+import java.time.LocalDateTime;
+
+import org.springframework.data.annotation.Id;
+
 /**
  * Coarse classification for {@link LegoSet}s, like "Car", "Plane", "Building" and so on.
  *
@@ -32,6 +32,12 @@
 @Data
 public class Category {
 
+	private final @Id Long id;
+	private String name, description;
+	private LocalDateTime created = LocalDateTime.now();
+	private @Setter long inserted;
+	private AgeGroup ageGroup;
+
 	public Category(String name, String description, AgeGroup ageGroup) {
 
 		this.id = null;
@@ -40,23 +46,10 @@ public Category(String name, String description, AgeGroup ageGroup) {
 		this.ageGroup = ageGroup;
 	}
 
-	@Id
-	private final Long id;
-
-	private String name;
-	private String description;
-
-	private LocalDateTime created = LocalDateTime.now();
-
-	@Setter
-	private long inserted;
-
 	public void timeStamp() {
 
 		if (inserted == 0) {
 			inserted = System.currentTimeMillis();
 		}
 	}
-
-	private AgeGroup ageGroup;
 }
diff --git a/...sics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java b/...sics/src/main/java/example/springdata/jdbc/basics/simpleentity/CategoryConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2017-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package example.springdata.jdbc.basics.simpleentity;
 
+import javax.sql.DataSource;
+
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 import org.springframework.context.annotation.Bean;
@@ -30,8 +32,6 @@
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 
-import javax.sql.DataSource;
-
 /**
  * Contains infrastructure necessary for creating repositories and two listeners.
  * <p>
@@ -43,24 +43,23 @@
 @EnableJdbcRepositories
 public class CategoryConfiguration {
 
-
 	@Bean
 	public ApplicationListener<?> loggingListener() {
 
 		return (ApplicationListener<ApplicationEvent>) event -> {
 			if (event instanceof JdbcEvent) {
-				System.out.println("received an event: " + event);
+				System.out.println("Received an event: " + event);
 			}
 		};
 	}
 
-
 	@Bean
 	public ApplicationListener<BeforeSave> timeStampingSaveTime() {
 
 		return event -> {
 
 			Object entity = event.getEntity();
+
 			if (entity instanceof Category) {
 				Category category = (Category) entity;
 				category.timeStamp();
@@ -73,7 +72,6 @@ public ApplicationListener<BeforeSave> timeStampingSaveTime() {
 	DataAccessStrategy defaultDataAccessStrategy(JdbcMappingContext context, DataSource dataSource) {
 
 		NamedParameterJdbcOperations operations = new NamedParameterJdbcTemplate(dataSource);
-
 		DelegatingDataAccessStrategy accessStrategy = new DelegatingDataAccessStrategy();
 
 		accessStrategy.setDelegate(new DefaultDataAccessStrategy( //