Merge pull request #229 from dickschoeller/228-dependency-updates

Fixes #228 - dependency updates
dickschoeller · Mar 9, 2017 · cbef77f · cbef77f
2 parents 1c35846 + 4bd1e4a
commit cbef77f
Show file tree

Hide file tree

Showing 9 changed files with 97 additions and 135 deletions.
diff --git a/config/settings.xml b/config/settings.xml
@@ -69,4 +69,14 @@
       </properties>
     </profile>
   </profiles>
+
+  <!-- proxies>
+    <proxy>
+      <active>true</active>
+      <protocol>http</protocol>
+      <host>proxy.bos.sap.corp</host>
+      <port>8080</port>
+      <nonProxyHosts>*.ariba.com|*.sap.corp|*.corp.sap</nonProxyHosts>
+    </proxy>
+  </proxies -->
 </settings>
diff --git a/...c/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/AbstractAnalysisVisitor.java b/...c/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/AbstractAnalysisVisitor.java
@@ -0,0 +1,77 @@
+package org.schoellerfamily.gedbrowser.analytics.visitor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.schoellerfamily.gedbrowser.datamodel.Attribute;
+import org.schoellerfamily.gedbrowser.datamodel.Child;
+import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor;
+
+/**
+ * Implements behaviors shared by Person and Family analysis visitors.
+ *
+ * @author Dick Schoeller
+ */
+public abstract class AbstractAnalysisVisitor extends IgnoreableProcessor
+        implements GedObjectVisitor {
+    /** */
+    private final List<Attribute> attributes = new ArrayList<>();
+    /** */
+    private final List<Attribute> trimmedAttributes = new ArrayList<>();
+    /** */
+    private final List<Child> children = new ArrayList<>();
+
+    /**
+     * Constructor.
+     */
+    public AbstractAnalysisVisitor() {
+        super();
+    }
+
+    /**
+     * @return the list of all attributes
+     */
+    public final List<Attribute> getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * @return the list of attributes that are interesting
+     */
+    public final List<Attribute> getTrimmedAttributes() {
+        return trimmedAttributes;
+    }
+
+    /**
+     * @return the list of attributes that are interesting
+     */
+    public final List<Child> getChildren() {
+        return children;
+    }
+
+    /**
+     * Visit an Attribute. Track the complete list of Attributes and a list
+     * trimmed by removing "ignoreable" attributes.
+     *
+     * @see GedObjectVisitor#visit(Attribute)
+     */
+    @Override
+    public final void visit(final Attribute attribute) {
+        attributes.add(attribute);
+        if (ignoreable(attribute)) {
+            return;
+        }
+        trimmedAttributes.add(attribute);
+    }
+
+    /**
+     * Visit a Child. The list of children may be used by the calling
+     * algorithm.
+     *
+     * @see GedObjectVisitor#visit(Child)
+     */
+    @Override
+    public final void visit(final Child child) {
+        children.add(child);
+    }
+}
diff --git a/...src/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/FamilyAnalysisVisitor.java b/...src/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/FamilyAnalysisVisitor.java
@@ -1,10 +1,5 @@
 package org.schoellerfamily.gedbrowser.analytics.visitor;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.schoellerfamily.gedbrowser.datamodel.Attribute;
-import org.schoellerfamily.gedbrowser.datamodel.Child;
 import org.schoellerfamily.gedbrowser.datamodel.Family;
 import org.schoellerfamily.gedbrowser.datamodel.GedObject;
 import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor;
@@ -14,64 +9,7 @@
  *
  * @author Dick Schoeller
  */
-public final class FamilyAnalysisVisitor extends IgnoreableProcessor
-        implements GedObjectVisitor {
-    /** */
-    private final List<Attribute> attributes = new ArrayList<>();
-
-    /** */
-    private final List<Attribute> trimmedAttributes = new ArrayList<>();
-
-    /** */
-    private final List<Child> children = new ArrayList<>();
-
-    /**
-     * @return the list of all attributes
-     */
-    public List<Attribute> getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * @return the list of attributes that are interesting
-     */
-    public List<Attribute> getTrimmedAttributes() {
-        return trimmedAttributes;
-    }
-
-    /**
-     * @return the list of attributes that are interesting
-     */
-    public List<Child> getChildren() {
-        return children;
-    }
-
-    /**
-     * Visit an Attribute. Track the complete list of Attributes and a list
-     * trimmed by removing "ignoreable" attributes.
-     *
-     * @see GedObjectVisitor#visit(Attribute)
-     */
-    @Override
-    public void visit(final Attribute attribute) {
-        attributes.add(attribute);
-        if (ignoreable(attribute)) {
-            return;
-        }
-        trimmedAttributes.add(attribute);
-    }
-
-    /**
-     * Visit a Child. The list of children may be used by the calling
-     * algorithm.
-     *
-     * @see GedObjectVisitor#visit(Child)
-     */
-    @Override
-    public void visit(final Child child) {
-        children.add(child);
-    }
-
+public final class FamilyAnalysisVisitor extends AbstractAnalysisVisitor {
     /**
      * Visit a Family. This is the primary focus of the visitation. From
      * here, interesting information is gathered from the attributes.

diff --git a/...src/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/PersonAnalysisVisitor.java b/...src/main/java/org/schoellerfamily/gedbrowser/analytics/visitor/PersonAnalysisVisitor.java
@@ -1,75 +1,13 @@
 package org.schoellerfamily.gedbrowser.analytics.visitor;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.schoellerfamily.gedbrowser.datamodel.Attribute;
-import org.schoellerfamily.gedbrowser.datamodel.Child;
 import org.schoellerfamily.gedbrowser.datamodel.GedObject;
 import org.schoellerfamily.gedbrowser.datamodel.Person;
 import org.schoellerfamily.gedbrowser.datamodel.visitor.GedObjectVisitor;
 
 /**
  * @author Dick Schoeller
  */
-public final class PersonAnalysisVisitor extends IgnoreableProcessor
-        implements GedObjectVisitor {
-    /** */
-    private final List<Attribute> attributes = new ArrayList<>();
-
-    /** */
-    private final List<Attribute> trimmedAttributes = new ArrayList<>();
-
-    /** */
-    private final List<Child> children = new ArrayList<>();
-
-    /**
-     * @return the list of all attributes
-     */
-    public List<Attribute> getAttributes() {
-        return attributes;
-    }
-
-    /**
-     * @return the list of attributes that are interesting
-     */
-    public List<Attribute> getTrimmedAttributes() {
-        return trimmedAttributes;
-    }
-
-    /**
-     * @return the list of attributes that are interesting
-     */
-    public List<Child> getChildren() {
-        return children;
-    }
-
-    /**
-     * Visit an Attribute. Track the complete list of Attributes and a list
-     * trimmed by removing "ignoreable" attributes.
-     *
-     * @see GedObjectVisitor#visit(Attribute)
-     */
-    @Override
-    public void visit(final Attribute attribute) {
-        attributes.add(attribute);
-        if (ignoreable(attribute)) {
-            return;
-        }
-        trimmedAttributes.add(attribute);
-    }
-
-    /**
-     * Visit a Child. The list of children may be used by the calling
-     * algorithm.
-     *
-     * @see GedObjectVisitor#visit(Child)
-     */
-    @Override
-    public void visit(final Child child) {
-        children.add(child);
-    }
-
+public final class PersonAnalysisVisitor extends AbstractAnalysisVisitor {
     /**
      * Visit a Person. This is the primary focus of the visitation. From
      * here, interesting information is gathered from the attributes.

diff --git a/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Index.java b/gedbrowser-datamodel/src/main/java/org/schoellerfamily/gedbrowser/datamodel/Index.java
@@ -49,7 +49,6 @@ void init() {
 
         final RootVisitor visitor = new RootVisitor();
         mRoot.accept(visitor);
-        visitor.getPersons();
         for (final Person person : visitor.getPersons()) {
             final String key = person.getString();
             // Surname for inclusion in the index.

diff --git a/gedbrowser/pom.xml b/gedbrowser/pom.xml
@@ -44,7 +44,7 @@
         <!-- Import dependency management from Spring Boot -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.2.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/geoservice-client/pom.xml b/geoservice-client/pom.xml
@@ -136,7 +136,7 @@
         <!-- Import dependency management from Spring Boot -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.2.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/geoservice/pom.xml b/geoservice/pom.xml
@@ -44,7 +44,7 @@
         <!-- Import dependency management from Spring Boot -->
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>
-        <version>1.5.1.RELEASE</version>
+        <version>1.5.2.RELEASE</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/pom.xml b/pom.xml
@@ -52,13 +52,13 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <spring-boot.version>1.5.1.RELEASE</spring-boot.version>
+    <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
     <thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
-    <spring.version>4.3.6.RELEASE</spring.version>
+    <spring.version>4.3.7.RELEASE</spring.version>
     <junit.version>4.12</junit.version>
-    <cglib.version>3.2.4</cglib.version>
-    <spring-data-mongodb.version>1.10.0.RELEASE</spring-data-mongodb.version>
-    <spring-data-commons.version>1.13.0.RELEASE</spring-data-commons.version>
+    <cglib.version>3.2.5</cglib.version>
+    <spring-data-mongodb.version>1.10.1.RELEASE</spring-data-mongodb.version>
+    <spring-data-commons.version>1.13.1.RELEASE</spring-data-commons.version>
     <google-maps-services.version>0.1.17</google-maps-services.version>
     <jackson-core.version>2.8.7</jackson-core.version>
     <gedcom4j.version>4.0.1</gedcom4j.version>