Convince revapi that we are not breaking things

revapi is set to <patch>equivalent</patch> which mean we cannot even do non-breaking changes in public APIs.
neo4j · Oct 12, 2018 · 24dd588 · 24dd588
1 parent 8ffdf4f
commit 24dd588
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java b/community/server-api/src/main/java/org/neo4j/server/helpers/PropertyTypeDispatcher.java
@@ -268,11 +268,23 @@ protected T dispatchNullProperty( K param )
     @SuppressWarnings( "boxing" )
     protected abstract T dispatchBooleanProperty( boolean property, K param );
 
-    protected abstract T dispatchPointProperty( Point property, K param );
+    //not abstract in order to not break existing code, since this was fixed in point release
+    protected T dispatchPointProperty( Point property, K param )
+    {
+        return dispatchOtherProperty( property, param );
+    }
 
-    protected abstract T dispatchTemporalProperty( Temporal property, K param );
+    //not abstract in order to not break existing code, since this was fixed in point release
+    protected T dispatchTemporalProperty( Temporal property, K param )
+    {
+        return dispatchOtherProperty( property, param );
+    }
 
-    protected abstract T dispatchTemporalAmountProperty( TemporalAmount property, K param );
+    //not abstract in order to not break existing code, since this was fixed in point release
+    protected T dispatchTemporalAmountProperty( TemporalAmount property, K param )
+    {
+        return dispatchOtherProperty( property, param );
+    }
 
     protected T dispatchOtherProperty( Object property, K param )
     {

diff --git a/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java b/community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java
@@ -19,11 +19,6 @@
  */
 package org.neo4j.server.rest.repr;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetTime;
-import java.time.ZonedDateTime;
 import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAmount;
 import java.util.HashMap;
@@ -36,7 +31,6 @@
 import org.neo4j.graphdb.RelationshipType;
 import org.neo4j.graphdb.schema.ConstraintDefinition;
 import org.neo4j.graphdb.schema.IndexDefinition;
-import org.neo4j.graphdb.spatial.Geometry;
 import org.neo4j.graphdb.spatial.Point;
 import org.neo4j.values.storable.DateTimeValue;
 

diff --git a/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java b/community/server/src/test/java/org/neo4j/server/rest/AbstractRestFunctionalTestBase.java
@@ -293,7 +293,7 @@ public static int getLocalHttpPort()
     public static HTTP.Response runQuery( String query, String...contentTypes  )
     {
         String resultDataContents = "";
-        if (contentTypes.length > 0 )
+        if ( contentTypes.length > 0 )
         {
             resultDataContents = ", 'resultDataContents': [" + Arrays.stream( contentTypes )
                     .map( unquoted -> format( "'%s'", unquoted ) ).collect( joining( "," ) ) + "]";

diff --git a/pom.xml b/pom.xml
@@ -264,6 +264,11 @@
                     </include>
                     <exclude>
                       <item>org\.neo4j\.graphdb\.Path</item>
+                      <!--TODO remove this again once released-->
+                      <item>org\.neo4j\.server\.rest\.repr\.ListRepresentation</item>
+                      <item>org\.neo4j\.server\.rest\.repr\.RepresentationType</item>
+                      <item>org\.neo4j\.server\.rest\.repr\.ValueRepresentation</item>
+                      <item>org\.neo4j\.server\.helpers\.PropertyTypeDispatcher</item>
                     </exclude>
                   </classes>
                   <packages>