Merge pull request #533 from php-coder

Author: php-coder

.travis.yml

@@ -2,7 +2,7 @@ language: java
 
 env:
   matrix:
-    - SPRING_PROFILES_ACTIVE=test
+    #- SPRING_PROFILES_ACTIVE=test
     - SPRING_PROFILES_ACTIVE=travis
   global:
     - secure: "fBav56BzY+A+Vs1g9YSfo1oLDCO1rFrXl49lJkOA5/XpnsKEEs4lI2RcOzz0wiJKXFNgcliiAJWoYMI8Esqz+lkyFWan4ij5Co0UzJcytDuY+2o+jaqwx45DuDYPogABzT+hWjLCxQLLG46gUkChzT8kcvOOn6JxC7Ff8q5MnoM="
@@ -16,6 +16,9 @@ before_script:
       npm install -g bootlint;
       pip install --user html5validator;
       pip install --user robotframework-lint;
+      if [ "$TRAVIS_PULL_REQUEST" != 'false' ]; then
+        gem install bundler danger --no-ri --no-rdoc;
+      fi;
     fi
 
 script:

Dangerfile

@@ -0,0 +1,15 @@
+message("Hello, this worked")
+
+# Sometimes it's a README fix, or something like that - which isn't relevant for
+# including in a project's CHANGELOG for example
+#declared_trivial = github.pr_title.include? "#trivial"
+
+# Make it more obvious that a PR is a work in progress and shouldn't be merged yet
+#warn("PR is classed as Work in Progress") if github.pr_title.include? "[WIP]"
+
+# Warn when there is a big PR
+#warn("Big PR") if git.lines_of_code > 500
+
+# Don't let testing shortcuts get into master by accident
+#fail("fdescribe left in tests") if `grep -r fdescribe specs/ `.length > 1
+#fail("fit left in tests") if `grep -r fit specs/ `.length > 1

pom.xml

@@ -10,18 +10,18 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>com.github.heneke.thymeleaf</groupId>
-			<artifactId>thymeleaf-extras-togglz</artifactId>
-			<version>${thymeleaf.togglz.version}</version>
-		</dependency>
-		
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
 			<version>${javax.validation.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.github.heneke.thymeleaf</groupId>
+			<artifactId>thymeleaf-extras-togglz</artifactId>
+			<version>${thymeleaf.togglz.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
@@ -733,6 +733,7 @@
 				</executions>
 			</plugin>
 
+			<!--
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
@@ -744,8 +745,9 @@
 						<suiteXmlFile>${basedir}/src/test/config/testng.xml</suiteXmlFile>
 					</suiteXmlFiles>
 				</configuration>
-				<!-- Use default <execution> configuration from spring-boot-starter-parent -->
 			</plugin>
+			-->
+				<!-- Use default <execution> configuration from spring-boot-starter-parent -->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -931,13 +933,15 @@
 						<variable>SITE_URL:http://127.0.0.1:8080</variable>
 					</variables>
 				</configuration>
+				<!--
 				<executions>
 					<execution>
 						<goals>
 							<goal>run</goal>
 						</goals>
 					</execution>
 				</executions>
+				-->
 			</plugin>
 
 			<plugin>
@@ -960,6 +964,7 @@
 						</exclude>
 					</excludes>
 				</configuration>
+				<!--
 				<executions>
 					<execution>
 						<id>start-application</id>
@@ -974,6 +979,7 @@
 						</goals>
 					</execution>
 				</executions>
+				-->
 			</plugin>
 
 		</plugins>

src/main/config/findbugs-filter.xml

@@ -17,13 +17,6 @@
 		<Class name="~.*\.model\..*" />
 		<Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
 	</Match>
-	<Match>
-		<!--
-			It's ok, that we're don't override parent's equals() method.
-		-->
-		<Class name="ru.mystamps.web.support.spring.security.CustomUserDetails" />
-		<Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS" />
-	</Match>
 	<Match>
 		<!--
 			I don't care about a serialVersionUID field.

src/main/java/ru/mystamps/web/Db.java

@@ -1,20 +1,3 @@
-/*
- * Copyright (C) 2009-2017 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;
 
 public final class Db {

src/main/java/ru/mystamps/web/controller/CategoryController.java

@@ -61,8 +61,7 @@ public class CategoryController {
 
 	@InitBinder("addCategoryForm")
 	protected void initBinder(WebDataBinder binder) {
-		// We can't use StringTrimmerEditor here because "only one single registered custom
-		// editor per property path is supported".
+		// We can't use StringTrimmerEditor here because "only one single registered custom editor per property path is supported".
 		ReplaceRepeatingSpacesEditor editor = new ReplaceRepeatingSpacesEditor(true);
 		binder.registerCustomEditor(String.class, "name", editor);
 		binder.registerCustomEditor(String.class, "nameRu", editor);

src/main/java/ru/mystamps/web/controller/CountryController.java

@@ -17,13 +17,13 @@
  */
 package ru.mystamps.web.controller;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+
 import java.io.IOException;
 import java.util.List;
 import java.util.Locale;
 
-import javax.servlet.http.HttpServletResponse;
-import javax.validation.Valid;
-
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;

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

@@ -42,12 +42,6 @@
 import ru.mystamps.web.dao.dto.SitemapInfoDto;
 
 // TODO: move stamps related methods to separate interface (#88)
-@SuppressWarnings({
-	"PMD.AvoidDuplicateLiterals",
-	"PMD.TooManyMethods",
-	"PMD.TooManyFields",
-	"PMD.LongVariable"
-})
 @RequiredArgsConstructor
 public class JdbcSeriesDao implements SeriesDao {
 

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

@@ -72,7 +72,7 @@ public void sendDailyStatistics() {
 
 		report.setAddedSeriesCounter(seriesService.countAddedSince(yesterday));
 		report.setUpdatedSeriesCounter(seriesService.countUpdatedSince(yesterday));
-		report.setUpdatedCollectionsCounter(collectionService.countUpdatedSince(yesterday));
+		//report.setUpdatedCollectionsCounter(collectionService.countUpdatedSince(yesterday));
 		report.setRegistrationRequestsCounter(usersActivationService.countCreatedSince(yesterday));
 		report.setRegisteredUsersCounter(userService.countRegisteredSince(yesterday));
 

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

@@ -55,7 +55,6 @@ public class SiteServiceImpl implements SiteService {
 	private final SuspiciousActivityDao suspiciousActivities;
 
 	@Override
-	@SuppressWarnings("PMD.UseObjectForClearerAPI")
 	@Async
 	@Transactional
 	public void logAboutAbsentPage(
@@ -70,7 +69,6 @@ public void logAboutAbsentPage(
 	}
 
 	@Override
-	@SuppressWarnings("PMD.UseObjectForClearerAPI")
 	@Transactional
 	public void logAboutFailedAuthentication(
 			String page,

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

@@ -85,7 +85,7 @@ public void registerUser(ActivateAccountDto dto) {
 
 		AddUserDbDto user = new AddUserDbDto();
 		user.setLogin(login);
-		user.setRole(USER);
+		//user.setRole(USER);
 		user.setName(finalName);
 		user.setEmail(email);
 		user.setRegisteredAt(registrationDate);

src/main/scripts/ci/check-build-and-verify.sh

@@ -32,7 +32,6 @@ if [ "$RUN_ONLY_INTEGRATION_TESTS" = 'no' ]; then
 	mvn --batch-mode sortpom:verify -Dsort.verifyFail=stop >pom.log || POM_FAIL=yes
 	find src -type f -name '*.html' | xargs bootlint >bootlint.log 2>&1 || BOOTLINT_FAIL=yes
 	rflint --ignore TooFewKeywordSteps \
-		--configure LineTooLong:110 \
 		src/test/robotframework \
 		>rflint.log 2>&1 || RFLINT_FAIL=yes
 	mvn --batch-mode jasmine:test >jasmine.log 2>&1 || JASMINE_FAIL=yes
@@ -98,6 +97,10 @@ print_log verify.log   'Run integration tests'
 
 rm -f cs.log pmd.log codenarc.log license.log bootlint.log rflint.log jasmine.log validator.log test.log findbugs.log verify.log
 
+if [ "$SPRING_PROFILES_ACTIVE" = 'travis' -a "${TRAVIS_PULL_REQUEST:-}" != 'false' ]; then
+	danger
+fi
+
 if [ -n "$CS_FAIL$PMD_FAIL$CODENARC_FAIL$LICENSE_FAIL$POM_FAIL$BOOTLINT_FAIL$RFLINT_FAIL$JASMINE_FAIL$HTML_FAIL$TEST_FAIL$FINDBUGS_FAIL$VERIFY_FAIL" ]; then
 	exit 1
 fi

src/test/groovy/ru/mystamps/web/service/CategoryServiceImplTest.groovy

@@ -452,7 +452,6 @@ class CategoryServiceImplTest extends Specification {
 			thrown IllegalArgumentException
 	}
 
-	@SuppressWarnings(['ClosureAsLastMethodParameter', 'UnnecessaryReturnKeyword'])
 	def "getStatisticsOf() should pass arguments to dao"() {
 		given:
 			Integer expectedCollectionId = 15

src/test/groovy/ru/mystamps/web/service/CollectionServiceImplTest.groovy

@@ -96,7 +96,7 @@ class CollectionServiceImplTest extends Specification {
 	@SuppressWarnings(['ClosureAsLastMethodParameter', 'FactoryMethodName', 'UnnecessaryReturnKeyword'])
 	def "createCollection() should assign updated at to current date"() {
 		when:
-			service.createCollection(123, 'any-login')
+			service.createCollection(123, "any-login")
 		then:
 			1 * collectionDao.add({ AddCollectionDbDto collection ->
 				assert DateUtils.roughlyEqual(collection?.updatedAt, new Date())

src/test/javascript/CatlogUtilsSpec.js

@@ -13,7 +13,7 @@ describe("CatalogUtils.expandNumbers()", function() {
 	});
 
 	it("should return string without hyphen as it", function() {
-		expect(CatalogUtils.expandNumbers("test")).toEqual("test");
+		expect(CatalogUtils.expandNumbers("test")).toEqual("2test");
 	});
 
 	it("should return 'one-two' for 'one-two'", function() {