/collection/{slug}: fix EmptyResultDataAccessException for not existing collection.

Fix #449

Author: bodom91

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

@@ -28,6 +28,7 @@
 import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
 import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
@@ -173,11 +174,15 @@ public void removeSeriesFromCollection(Integer collectionId, Integer seriesId) {
 
 	@Override
 	public CollectionInfoDto findCollectionInfoBySlug(String slug) {
-		return jdbcTemplate.queryForObject(
-			findCollectionInfoBySlugSql,
-			Collections.singletonMap("slug", slug),
-			RowMappers::forCollectionInfoDto
-		);
+		try {
+			return jdbcTemplate.queryForObject(
+				findCollectionInfoBySlugSql,
+				Collections.singletonMap("slug", slug),
+				RowMappers::forCollectionInfoDto
+			);
+		} catch (EmptyResultDataAccessException ignored) {
+			return null;
+		}
 	}
 
 }

src/test/config/testng.xml

@@ -163,4 +163,10 @@
 		</classes>
 	</test>
 
+	<test name="When anonymous user open not existing collection page">
+		<classes>
+			<class name="ru.mystamps.web.tests.cases.WhenAnonymousUserOpenNotExistingCollectionPage" />
+		</classes>
+	</test>
+	
 </suite>

src/test/java/ru/mystamps/web/tests/cases/WhenAnonymousUserOpenNotExistingCollectionPage.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2009-2016 Slava Semushin <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+package ru.mystamps.web.tests.cases;
+
+import java.net.HttpURLConnection;
+
+import org.testng.annotations.Test;
+
+import ru.mystamps.web.Url;
+import ru.mystamps.web.tests.page.NotFoundErrorPage;
+
+import static ru.mystamps.web.tests.TranslationUtils.tr;
+
+import static org.fest.assertions.api.Assertions.assertThat;
+
+public class WhenAnonymousUserOpenNotExistingCollectionPage
+	extends WhenAnyUserAtAnyPage<NotFoundErrorPage> {
+
+	public WhenAnonymousUserOpenNotExistingCollectionPage() {
+		super(NotFoundErrorPage.class);
+		hasTitleWithoutStandardPrefix(tr("t_404_title"));
+		hasResponseServerCode(HttpURLConnection.HTTP_NOT_FOUND);
+	}
+
+	@Test(groups = "logic")
+	public void shouldShow404Page() {
+		String url = Url.INFO_COLLECTION_PAGE.replace("{slug}", "collection-404-error-test");
+		page.open(url);
+
+		checkStandardStructure();
+
+		assertThat(page.getErrorMessage()).isEqualTo(tr("t_404_description", "\n"));
+		assertThat(page.getErrorCode()).isEqualTo("404");
+	}
+
+}