Merge 8a7906e into fc5c770

dickschoeller · Feb 5, 2017 · 1d3abf5 · 1d3abf5
2 parents fc5c770 + 8a7906e
commit 1d3abf5
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 59 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ Check it out by perusing [my genealogy database](http://www.schoellerfamily.org/
 | :--- | :--- | :--- | :--- | :--- | :--- | :--- |
 | Master | [![Build Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser)](http://www.schoellerfamily.org/jenkins/job/gedbrowser/) | [![Build Status](https://api.travis-ci.org/dickschoeller/gedbrowser.svg?branch=master)](https://travis-ci.org/dickschoeller/gedbrowser) | [![Coverage Status](https://coveralls.io/repos/github/dickschoeller/gedbrowser/badge.svg?branch=master)](https://coveralls.io/github/dickschoeller/gedbrowser?branch=master) | [![Dependency Status](https://www.versioneye.com/user/projects/5875a8c4fff5dc0039db0d10/badge.svg)](https://www.versioneye.com/user/projects/5875a8c4fff5dc0039db0d10?child=summary#tab-dependencies) | [![Selenium Test Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser-selenium)](http://www.schoellerfamily.org/jenkins/job/gedbrowser-selenium) |
 | Development | [![Build Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser-development)](http://www.schoellerfamily.org/jenkins/job/gedbrowser-development/) | [![Build Status](https://api.travis-ci.org/dickschoeller/gedbrowser.svg?branch=development)](https://travis-ci.org/dickschoeller/gedbrowser) | [![Coverage Status](https://coveralls.io/repos/github/dickschoeller/gedbrowser/badge.svg?branch=development)](https://coveralls.io/github/dickschoeller/gedbrowser?branch=development) |[![Dependency Status](https://www.versioneye.com/user/projects/5894a1e327d3c300443034fe/badge.svg)](https://www.versioneye.com/user/projects/5894a1e327d3c300443034fe?child=summary#tab-dependencies) | [![Selenium Test Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser-selenium-development)](http://www.schoellerfamily.org/jenkins/job/gedbrowser-selenium-development) | [![Code Climate](https://codeclimate.com/github/dickschoeller/gedbrowser/badges/gpa.svg)](https://codeclimate.com/github/dickschoeller/gedbrowser) |
-| Pull Request | [![Build Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser-pull)](http://www.schoellerfamily.org/jenkins/job/gedbrowser-pull/) | [![Build Status](https://api.travis-ci.org/dickschoeller/gedbrowser.svg)](https://travis-ci.org/dickschoeller/gedbrowser) | [![Coverage Status](https://coveralls.io/repos/github/dickschoeller/gedbrowser/badge.svg)](https://coveralls.io/github/dickschoeller/gedbrowser) |
+| Pull Request | [![Build Status](http://www.schoellerfamily.org/jenkins/buildStatus/icon?job=gedbrowser-pull)](http://www.schoellerfamily.org/jenkins/job/gedbrowser-pull/) | [![Build Status](https://api.travis-ci.org/dickschoeller/gedbrowser.svg)](https://travis-ci.org/dickschoeller/gedbrowser) | [![Coverage Status](https://coveralls.io/repos/github/dickschoeller/gedbrowser/badge.svg)](https://coveralls.io/github/dickschoeller/gedbrowser) | | | [![Code Climate](https://codeclimate.com/github/dickschoeller/gedbrowser/badges/gpa.svg)](https://codeclimate.com/github/dickschoeller/gedbrowser) |
 
 ## Getting started
 

diff --git a/config/checkstyle.xml b/config/checkstyle.xml
@@ -70,7 +70,9 @@ Allow field shadowing with constructor and setter arguments
     </module -->
     <module name="SimplifyBooleanExpression"/>
     <module name="SimplifyBooleanReturn"/>
-    <module name="DesignForExtension"/>
+    <module name="DesignForExtension">
+        <property name="ignoredAnnotations" value="Test, Before, After, BeforeClass, AfterClass, Bean"/>
+    </module>
     <module name="FinalClass"/>
     <module name="HideUtilityClassConstructor"/>
     <module name="InterfaceIsType"/>

diff --git a/.../schoellerfamily/gedbrowser/persistence/mongo/repository/test/MongoTestConfiguration.java b/.../schoellerfamily/gedbrowser/persistence/mongo/repository/test/MongoTestConfiguration.java
@@ -58,11 +58,8 @@ public class MongoTestConfiguration {
      * @return the MongoDbFactory
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoDbFactory mongoDbFactory() throws UnknownHostException {
-        // CHECKSTYLE:ON
         return new SimpleMongoDbFactory(
                 new MongoClient(host, port), "gedbrowserTest");
     }
@@ -73,11 +70,8 @@ public MongoDbFactory mongoDbFactory() throws UnknownHostException {
      * @return the template
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoTemplate mongoTemplate() throws UnknownHostException {
-        // CHECKSTYLE:ON
         final MongoTemplate mongoTemplate = new MongoTemplate(mongoDbFactory());
 
         return mongoTemplate;
@@ -90,22 +84,16 @@ public MongoTemplate mongoTemplate() throws UnknownHostException {
      *
      * @return the fixture
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public RepositoryFixture repositoryFixture() {
-        // CHECKSTYLE:ON
         return new RepositoryFixture();
     }
 
     /**
      * @return the finder
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public FinderStrategy finder() {
-        // CHECKSTYLE:ON
         return new RepositoryFinderMongo();
     }
 }
diff --git a/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java b/gedbrowser/src/main/java/org/schoellerfamily/gedbrowser/UsersConfiguration.java
@@ -26,11 +26,8 @@ public class UsersConfiguration {
      *
      * @return the Users object
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public Users users() {
-        // CHECKSTYLE:ON
         final String userFile = gedbrowserHome + "/userFile.csv";
         return readUserFile(userFile);
     }

diff --git a/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java b/gedbrowser/src/test/java/org/schoellerfamily/gedbrowser/test/ApplicationInfoTest.java
@@ -33,11 +33,8 @@ static class ContextConfiguration {
         /**
          * @return the backup manager
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public ApplicationInfo appInfo() {
-            // CHECKSTYLE:ON
             return new ApplicationInfo();
         }
     }

diff --git a/...st/java/org/schoellerfamily/geoservice/persistence/mongo/test/MongoTestConfiguration.java b/...st/java/org/schoellerfamily/geoservice/persistence/mongo/test/MongoTestConfiguration.java
@@ -46,19 +46,14 @@ public class MongoTestConfiguration {
     /**
      * @return the persistence manager
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public GeoCode persistenceManager() {
-        // CHECKSTYLE:ON
         return new GeoCodeMongo();
     }
 
     /**
      * @return the geocoder
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public GeoCoder geoCoder() {
         final GeoCodeTestFixture tempFixture = new GeoCodeTestFixture();
@@ -71,11 +66,8 @@ public GeoCoder geoCoder() {
      * @return the MongoDbFactory
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoDbFactory mongoDbFactory() throws UnknownHostException {
-        // CHECKSTYLE:ON
         return new SimpleMongoDbFactory(
                 new MongoClient(host, port), "geoserviceTest");
     }
@@ -86,11 +78,8 @@ public MongoDbFactory mongoDbFactory() throws UnknownHostException {
      * @return the template
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoTemplate mongoTemplate() throws UnknownHostException {
-        // CHECKSTYLE:ON
         final MongoTemplate mongoTemplate = new MongoTemplate(mongoDbFactory());
 
         return mongoTemplate;
@@ -103,22 +92,16 @@ public MongoTemplate mongoTemplate() throws UnknownHostException {
      *
      * @return the fixture
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public GeoRepositoryFixture repositoryFixture() {
-        // CHECKSTYLE:ON
         return new GeoRepositoryFixture();
     }
 
     /**
      * @return the geocodeloader
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public GeoCodeLoader loader() {
-        // CHECKSTYLE:ON
         return new GeoCodeLoader();
     }
 }
diff --git a/...ersistence/src/test/java/org/schoellerfamily/geoservice/persistence/test/GeoCodeTest.java b/...ersistence/src/test/java/org/schoellerfamily/geoservice/persistence/test/GeoCodeTest.java
@@ -91,8 +91,6 @@ public GeoCode geoCode() {
         /**
          * @return the geocoder
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public GeoCoder geoCoder() {
             return new StubGeoCoder(testFixture().expectedNotFound());
@@ -101,8 +99,6 @@ public GeoCoder geoCoder() {
         /**
          * @return the geocodeloader
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public GeoCodeLoader loader() {
             return new GeoCodeLoader();

diff --git a/geoservice/src/main/java/org/schoellerfamily/geoservice/MongoConfiguration.java b/geoservice/src/main/java/org/schoellerfamily/geoservice/MongoConfiguration.java
@@ -41,11 +41,8 @@ public class MongoConfiguration {
      * @return the MongoDbFactory
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoDbFactory mongoDbFactory() throws UnknownHostException {
-        // CHECKSTYLE:ON
         return new SimpleMongoDbFactory(new MongoClient(host, port),
                 "geoservice");
     }
@@ -56,11 +53,8 @@ public MongoDbFactory mongoDbFactory() throws UnknownHostException {
      * @return the template
      * @throws UnknownHostException because it must
      */
-    // We turn off checkstyle because bean methods must not be final
-    // CHECKSTYLE:OFF
     @Bean
     public MongoTemplate mongoTemplate() throws UnknownHostException {
-        // CHECKSTYLE:ON
         return new MongoTemplate(mongoDbFactory());
     }
 }
diff --git a/geoservice/src/test/java/org/schoellerfamily/geoservice/backup/test/GeoCodeBackupTest.java b/geoservice/src/test/java/org/schoellerfamily/geoservice/backup/test/GeoCodeBackupTest.java
@@ -48,30 +48,22 @@ static class ContextConfiguration {
         /**
          * @return the persistence manager
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public GeoCode persistenceManager() {
-            // CHECKSTYLE:ON
             return new GeoCodeStub();
         }
 
         /**
          * @return the backup manager
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public GeoCodeBackup backupManager() {
-            // CHECKSTYLE:ON
             return new GeoCodeBackup();
         }
 
         /**
          * @return the geocoder
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public GeoCoder geoCoder() {
             final GeoCodeTestFixture fixture = new GeoCodeTestFixture();

diff --git a/geoservice/src/test/java/org/schoellerfamily/geoservice/test/ApplicationInfoTest.java b/geoservice/src/test/java/org/schoellerfamily/geoservice/test/ApplicationInfoTest.java
@@ -33,11 +33,8 @@ static class ContextConfiguration {
         /**
          * @return the backup manager
          */
-        // We turn off checkstyle because bean methods must not be final
-        // CHECKSTYLE:OFF
         @Bean
         public ApplicationInfo appInfo() {
-            // CHECKSTYLE:ON
             return new ApplicationInfo();
         }
     }

diff --git a/pom.xml b/pom.xml
@@ -186,7 +186,7 @@
             <dependency>
               <groupId>com.puppycrawl.tools</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>7.4</version>
+              <version>7.5</version>
             </dependency>
           </dependencies>
           <executions>