Merge remote-tracking branch 'refs/remotes/php-coder/master'

Author: Shkarin

pom.xml

@@ -428,7 +428,7 @@
 		<commons-pool.version>1.5.4</commons-pool.version>
 
 		<commons.lang.version>3.4</commons.lang.version>
-		<compiler.plugin.version>3.6.0</compiler.plugin.version>
+		<compiler.plugin.version>3.6.1</compiler.plugin.version>
 		<coveralls.plugin.version>2.2.0</coveralls.plugin.version>
 		<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
 		<failsafe.plugin.version>2.19.1</failsafe.plugin.version>
@@ -475,9 +475,9 @@
 		<liquibase.version>3.5.3</liquibase.version>
 
 		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
-		<lombok.version>1.16.12</lombok.version>
+		<lombok.version>1.16.14</lombok.version>
 
-		<minify.plugin.version>1.7.4</minify.plugin.version>
+		<minify.plugin.version>1.7.6</minify.plugin.version>
 
 		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
 		<mysql.version>5.1.40</mysql.version>
@@ -488,9 +488,9 @@
 		<!-- Dependency can be safely removed when pmd plugin will require this version -->
 		<pmd.version>5.5.2</pmd.version>
 		<resources.plugin.version>3.0.2</resources.plugin.version>
-		<robotframework-plugin.version>1.4.6</robotframework-plugin.version>
+		<robotframework-plugin.version>1.4.7</robotframework-plugin.version>
 		<robotframework-selenium.version>1.4.0.8</robotframework-selenium.version>
-		<robotframework.version>3.0</robotframework.version>
+		<robotframework.version>3.0.2</robotframework.version>
 
 		<!-- Don't forget to update version in the Url class -->
 		<selectizejs.version>0.12.3</selectizejs.version>
@@ -504,7 +504,7 @@
 		<skipUnitTests>false</skipUnitTests>
 
 		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
-		<slf4j.version>1.7.22</slf4j.version>
+		<slf4j.version>1.7.24</slf4j.version>
 
 		<sortpom.plugin.version>2.5.0</sortpom.plugin.version>
 
@@ -519,12 +519,12 @@
 		<testng.version>6.8.8</testng.version>
 
 		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
-		<thymeleaf-extras-springsecurity4.version>3.0.1.RELEASE</thymeleaf-extras-springsecurity4.version>
+		<thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
 
 		<thymeleaf.togglz.version>2.0.0.RELEASE</thymeleaf.togglz.version>
 
 		<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
-		<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
+		<thymeleaf.version>3.0.3.RELEASE</thymeleaf.version>
 
 		<togglz.version>2.3.0.Final</togglz.version>
 		<war.plugin.version>3.0.0</war.plugin.version>
@@ -706,29 +706,29 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-enforcer-plugin</artifactId>
 				<version>${enforcer.plugin.version}</version>
+				<configuration>
+					<rules>
+						<bannedDependencies>
+							<excludes>
+								<!-- Because we use jcl-over-slf4j instead -->
+								<exclude>commons-logging</exclude>
+								<!-- Because we use org.mortbay.jasper:apache-el instead -->
+								<exclude>org.apache.tomcat.embed:tomcat-embed-el</exclude>
+								<exclude>junit:*:*:*:compile</exclude>
+								<exclude>org.yaml:snakeyaml</exclude>
+							</excludes>
+						</bannedDependencies>
+						<requireJavaVersion>
+							<version>${java.version}</version>
+						</requireJavaVersion>
+					</rules>
+				</configuration>
 				<executions>
 					<execution>
 						<id>enforce-banned-dependencies</id>
 						<goals>
 							<goal>enforce</goal>
 						</goals>
-						<configuration>
-							<rules>
-								<bannedDependencies>
-									<excludes>
-										<!-- Because we use jcl-over-slf4j instead -->
-										<exclude>commons-logging</exclude>
-										<!-- Because we use org.mortbay.jasper:apache-el instead -->
-										<exclude>org.apache.tomcat.embed:tomcat-embed-el</exclude>
-										<exclude>junit:*:*:*:compile</exclude>
-										<exclude>org.yaml:snakeyaml</exclude>
-									</excludes>
-								</bannedDependencies>
-								<requireJavaVersion>
-									<version>${java.version}</version>
-								</requireJavaVersion>
-							</rules>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>

src/main/java/ru/mystamps/web/config/ServicesConfig.java

@@ -67,6 +67,7 @@ public CronService getCronService() {
 		return new CronServiceImpl(
 			getCategoryService(),
 			getCountryService(),
+			getCollectionService(),
 			getSeriesService(),
 			getSuspiciousActivityService(),
 			getUserService(),

src/main/java/ru/mystamps/web/dao/CollectionDao.java

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.dao;
 
+import java.util.Date;
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.AddCollectionDbDto;
@@ -26,7 +27,9 @@
 public interface CollectionDao {
 	List<LinkEntityDto> findLastCreated(int quantity);
 	long countCollectionsOfUsers();
+	long countUpdatedSince(Date date);
 	Integer add(AddCollectionDbDto collection);
+	void markAsModified(Integer userId, Date updatedAt);
 	boolean isSeriesInUserCollection(Integer userId, Integer seriesId);
 	void addSeriesToUserCollection(Integer userId, Integer seriesId);
 	void removeSeriesFromUserCollection(Integer userId, Integer seriesId);

src/main/java/ru/mystamps/web/dao/dto/AddCollectionDbDto.java

@@ -17,6 +17,8 @@
  */
 package ru.mystamps.web.dao.dto;
 
+import java.util.Date;
+
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
@@ -27,4 +29,5 @@
 public class AddCollectionDbDto {
 	private Integer ownerId;
 	private String slug;
+	private Date updatedAt;
 }

src/main/java/ru/mystamps/web/dao/impl/JdbcCollectionDao.java

@@ -18,6 +18,7 @@
 package ru.mystamps.web.dao.impl;
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -54,8 +55,14 @@ public class JdbcCollectionDao implements CollectionDao {
 	@Value("${collection.count_collections_of_users}")
 	private String countCollectionsOfUsersSql;
 
+	@Value("${collection.count_updated_since}")
+	private String countUpdatedSinceSql;
+	
 	@Value("${collection.create}")
 	private String addCollectionSql;
+
+	@Value("${collection.mark_as_modified}")
+	private String markAsModifiedSql;
 
 	@Value("${collection.is_series_in_collection}")
 	private String isSeriesInUserCollectionSql;
@@ -87,11 +94,22 @@ public long countCollectionsOfUsers() {
 		);
 	}
 
+	@Override
+	public long countUpdatedSince(Date date) {
+		return jdbcTemplate.queryForObject(
+			countUpdatedSinceSql,
+			Collections.singletonMap("date", date),
+			Long.class
+		);
+	}
+	
 	@Override
 	public Integer add(AddCollectionDbDto collection) {
 		Map<String, Object> params = new HashMap<>();
 		params.put("user_id", collection.getOwnerId());
 		params.put("slug", collection.getSlug());
+		params.put("updated_at", collection.getUpdatedAt());
+		params.put("updated_by", collection.getOwnerId());
 
 		KeyHolder holder = new GeneratedKeyHolder();
 
@@ -110,6 +128,29 @@ public Integer add(AddCollectionDbDto collection) {
 
 		return Integer.valueOf(holder.getKey().intValue());
 	}
+
+	/**
+	 * @author John Shkarin
+	 * @author Slava Semushin
+	 */
+	@Override
+	public void markAsModified(Integer userId, Date updatedAt) {
+		Map<String, Object> params = new HashMap<>();
+		params.put("user_id", userId);
+		params.put("updated_at", updatedAt);
+		params.put("updated_by", userId);
+
+		int affected = jdbcTemplate.update(
+			markAsModifiedSql,
+			params
+		);
+
+		Validate.validState(
+			affected == 1,
+			"Unexpected number of affected rows after updating collection: %d",
+			affected
+		);
+	}
 
 	@Override
 	public boolean isSeriesInUserCollection(Integer userId, Integer seriesId) {

src/main/java/ru/mystamps/web/service/CollectionService.java

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.service;
 
+import java.util.Date;
 import java.util.List;
 
 import ru.mystamps.web.dao.dto.CollectionInfoDto;
@@ -28,6 +29,7 @@ public interface CollectionService {
 	void removeFromCollection(Integer userId, Integer seriesId);
 	boolean isSeriesInCollection(Integer userId, Integer seriesId);
 	long countCollectionsOfUsers();
+	long countUpdatedSince(Date date);
 	List<LinkEntityDto> findRecentlyCreated(int quantity);
 	CollectionInfoDto findBySlug(String slug);
 }

src/main/java/ru/mystamps/web/service/CollectionServiceImpl.java

@@ -17,6 +17,7 @@
  */
 package ru.mystamps.web.service;
 
+import java.util.Date;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
@@ -59,6 +60,7 @@ public void createCollection(Integer ownerId, String ownerLogin) {
 			"Slug for string '%s' must be non empty", ownerLogin
 		);
 		collection.setSlug(slug);
+		collection.setUpdatedAt(new Date());
 
 		Integer id = collectionDao.add(collection);
 
@@ -73,6 +75,7 @@ public void addToCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		collectionDao.addSeriesToUserCollection(userId, seriesId);
+		collectionDao.markAsModified(userId, new Date());
 
 		LOG.info("Series #{} has been added to collection of user #{}", seriesId, userId);
 	}
@@ -85,6 +88,7 @@ public void removeFromCollection(Integer userId, Integer seriesId) {
 		Validate.isTrue(seriesId != null, "Series id must be non null");
 
 		collectionDao.removeSeriesFromUserCollection(userId, seriesId);
+		collectionDao.markAsModified(userId, new Date());
 
 		LOG.info("Series #{} has been removed from collection of user #{}", seriesId, userId);
 	}
@@ -117,6 +121,14 @@ public long countCollectionsOfUsers() {
 		return collectionDao.countCollectionsOfUsers();
 	}
 
+	@Override
+	@Transactional(readOnly = true)
+	public long countUpdatedSince(Date date) {
+		Validate.isTrue(date != null, "Date must be non null");
+		
+		return collectionDao.countUpdatedSince(date);
+	}
+	
 	@Override
 	@Transactional(readOnly = true)
 	public List<LinkEntityDto> findRecentlyCreated(int quantity) {

src/main/java/ru/mystamps/web/service/CronServiceImpl.java

@@ -44,6 +44,7 @@ public class CronServiceImpl implements CronService {
 
 	private final CategoryService categoryService;
 	private final CountryService countryService;
+	private final CollectionService collectionService;
 	private final SeriesService seriesService;
 	private final SuspiciousActivityService suspiciousActivityService;
 	private final UserService userService;
@@ -71,6 +72,7 @@ public void sendDailyStatistics() {
 
 		report.setAddedSeriesCounter(seriesService.countAddedSince(yesterday));
 		report.setUpdatedSeriesCounter(seriesService.countUpdatedSince(yesterday));
+		report.setUpdatedCollectionsCounter(collectionService.countUpdatedSince(yesterday));
 		report.setRegistrationRequestsCounter(usersActivationService.countCreatedSince(yesterday));
 		report.setRegisteredUsersCounter(userService.countRegisteredSince(yesterday));
 

src/main/java/ru/mystamps/web/service/FilesystemImagePersistenceStrategy.java

@@ -40,21 +40,20 @@ public class FilesystemImagePersistenceStrategy implements ImagePersistenceStrat
 
 	private final File storageDir;
 
-	public FilesystemImagePersistenceStrategy(String directory) {
-		this.storageDir = new File(directory);
+	public FilesystemImagePersistenceStrategy(String storageDir) {
+		this.storageDir = new File(storageDir);
 	}
 
 	@PostConstruct
 	public void init() {
 		LOG.info("Images will be saved into {} directory", storageDir);
 
-		if (!storageDir.exists()) {
+		if (!storageDir.exists()) { // NOPMD: ConfusingTernary (it's ok for me)
 			LOG.warn("Directory '{}' doesn't exist! Image uploading won't work.", storageDir);
-		}
 
-		if (!storageDir.canWrite()) {
+		} else if (!storageDir.canWrite()) {
 			LOG.warn(
-				"Directory '{}' exists but doesn't writable for current user! "
+				"Directory '{}' exists but isn't writable for the current user! "
 				+ "Image uploading won't work.",
 				storageDir
 			);
@@ -64,7 +63,7 @@ public void init() {
 	@Override
 	public void save(MultipartFile file, ImageInfoDto image) {
 		try {
-			Path dest = createFile(image);
+			Path dest = generateFilePath(storageDir, image);
 			writeToFile(file, dest);
 
 			LOG.info("Image's data was written into file {}", dest);
@@ -76,24 +75,12 @@ public void save(MultipartFile file, ImageInfoDto image) {
 
 	@Override
 	public ImageDto get(ImageInfoDto image) {
-		Path dest = createFile(image);
-		if (!exists(dest)) {
-			LOG.warn("Found image without content: #{} ({} doesn't exist)", image.getId(), dest);
-			return null;
-		}
-		
-		try {
-			byte[] content = toByteArray(dest);
-			return new FsImageDto(image, content);
-		
-		} catch (IOException ex) {
-			throw new ImagePersistenceException(ex);
-		}
+		return get(storageDir, image);
 	}
 
 	// protected to allow spying
-	protected Path createFile(ImageInfoDto image) {
-		return new File(storageDir, generateFileName(image)).toPath();
+	protected Path generateFilePath(File dir, ImageInfoDto image) {
+		return new File(dir, generateFileName(image)).toPath();
 	}
 
 	// protected to allow spying
@@ -115,6 +102,22 @@ protected byte[] toByteArray(Path dest) throws IOException {
 		return Files.readAllBytes(dest);
 	}
 
+	private ImageDto get(File dir, ImageInfoDto image) {
+		Path dest = generateFilePath(dir, image);
+		if (!exists(dest)) {
+			LOG.warn("Found image without content: #{} ({} doesn't exist)", image.getId(), dest);
+			return null;
+		}
+		
+		try {
+			byte[] content = toByteArray(dest);
+			return new FsImageDto(image, content);
+		
+		} catch (IOException ex) {
+			throw new ImagePersistenceException(ex);
+		}
+	}
+	
 	private static String generateFileName(ImageInfoDto image) {
 		// TODO(performance): specify initial capacity explicitly
 		return new StringBuilder()

src/main/java/ru/mystamps/web/service/MailServiceImpl.java

@@ -197,7 +197,7 @@ private String getTextOfDailyStatisticsMail(AdminDailyReport report) {
 		put(ctx, "untranslated_categories_cnt", report.getUntranslatedCategoriesCounter());
 		put(ctx, "added_series_cnt", report.getAddedSeriesCounter());
 		put(ctx, "updated_series_cnt", report.getUpdatedSeriesCounter());
-		put(ctx, "updated_collections_cnt", -1L); // TODO: #357
+		put(ctx, "updated_collections_cnt", report.getUpdatedCollectionsCounter());
 		put(ctx, "registration_requests_cnt", report.getRegistrationRequestsCounter());
 		put(ctx, "registered_users_cnt", report.getRegisteredUsersCounter());
 		put(ctx, "events_cnt", report.countEvents());