removed dependency on velocypack-module-jdk8 and velocypack-module-joda

Author: rashtao

ChangeLog.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+- removed dependencies on `velocypack-module-jdk8` and `velocypack-module-joda`
+- upgraded dependency `com.arangodb:arangodb-java-driver:6.9.0`
+
 ## [3.4.1] - 2021-01-26
 
 - upgraded dependency `com.arangodb:arangodb-java-driver:6.8.2`

pom.xml

@@ -204,14 +204,6 @@
 			<groupId>com.arangodb</groupId>
 			<artifactId>arangodb-java-driver</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.arangodb</groupId>
-			<artifactId>velocypack-module-jdk8</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.arangodb</groupId>
-			<artifactId>velocypack-module-joda</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
@@ -285,16 +277,6 @@
 				<artifactId>arangodb-java-driver</artifactId>
 				<version>6.9.0</version>
 			</dependency>
-			<dependency>
-				<groupId>com.arangodb</groupId>
-				<artifactId>velocypack-module-jdk8</artifactId>
-				<version>1.1.1</version>
-			</dependency>
-			<dependency>
-				<groupId>com.arangodb</groupId>
-				<artifactId>velocypack-module-joda</artifactId>
-				<version>1.1.2</version>
-			</dependency>
 			<dependency>
 				<groupId>org.mockito</groupId>
 				<artifactId>mockito-core</artifactId>

src/main/java/com/arangodb/springframework/core/convert/DefaultArangoConverter.java

@@ -22,7 +22,12 @@
 
 import com.arangodb.entity.BaseDocument;
 import com.arangodb.entity.BaseEdgeDocument;
-import com.arangodb.springframework.annotation.*;
+import com.arangodb.springframework.annotation.Document;
+import com.arangodb.springframework.annotation.Edge;
+import com.arangodb.springframework.annotation.From;
+import com.arangodb.springframework.annotation.Ref;
+import com.arangodb.springframework.annotation.Relations;
+import com.arangodb.springframework.annotation.To;
 import com.arangodb.springframework.core.convert.resolver.LazyLoadingProxy;
 import com.arangodb.springframework.core.convert.resolver.ReferenceResolver;
 import com.arangodb.springframework.core.convert.resolver.RelationResolver;
@@ -35,7 +40,6 @@
 import com.arangodb.velocypack.VPackSlice;
 import com.arangodb.velocypack.ValueType;
 import com.arangodb.velocypack.internal.util.DateUtil;
-import com.arangodb.velocypack.module.jdk8.internal.util.JavaTimeUtil;
 import org.springframework.core.CollectionFactory;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
@@ -61,9 +65,20 @@
 import java.math.BigInteger;
 import java.sql.Timestamp;
 import java.text.ParseException;
-import java.time.*;
-import java.util.*;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 
 /**
  * @author Mark Vollmary

src/main/java/com/arangodb/springframework/core/convert/JavaTimeUtil.java

@@ -0,0 +1,79 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2018 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.springframework.core.convert;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * @author Mark Vollmary
+ *
+ */
+public class JavaTimeUtil {
+
+	private JavaTimeUtil() {
+		super();
+	}
+
+	public static String format(final Instant source) {
+		return DateTimeFormatter.ISO_INSTANT.format(source);
+	}
+
+	public static String format(final LocalDate source) {
+		return DateTimeFormatter.ISO_LOCAL_DATE.format(source);
+	}
+
+	public static String format(final OffsetDateTime source) {
+		return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(source);
+	}
+
+	public static String format(final LocalDateTime source) {
+		return DateTimeFormatter.ISO_LOCAL_DATE_TIME.format(source);
+	}
+
+	public static String format(final ZonedDateTime source) {
+		return DateTimeFormatter.ISO_ZONED_DATE_TIME.format(source);
+	}
+
+	public static Instant parseInstant(final CharSequence source) {
+		return Instant.parse(source);
+	}
+
+	public static LocalDate parseLocalDate(final CharSequence source) {
+		return LocalDate.parse(source);
+	}
+
+	public static LocalDateTime parseLocalDateTime(final CharSequence source) {
+		return LocalDateTime.parse(source);
+	}
+
+	public static OffsetDateTime parseOffsetDateTime(final CharSequence source) {
+		return OffsetDateTime.parse(source);
+	}
+
+	public static ZonedDateTime parseZonedDateTime(final CharSequence source) {
+		return ZonedDateTime.parse(source);
+	}
+}

src/main/java/com/arangodb/springframework/core/convert/JodaTimeStringConverters.java

@@ -20,11 +20,6 @@
 
 package com.arangodb.springframework.core.convert;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
 import org.joda.time.DateTime;
 import org.joda.time.Instant;
 import org.joda.time.LocalDate;
@@ -34,11 +29,14 @@
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.util.ClassUtils;
 
-import com.arangodb.velocypack.module.joda.internal.util.JodaTimeUtil;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
 
 /**
  * @author Mark Vollmary
- *
  */
 public class JodaTimeStringConverters {
 

src/main/java/com/arangodb/springframework/core/convert/JodaTimeUtil.java

@@ -0,0 +1,66 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.springframework.core.convert;
+
+import org.joda.time.DateTime;
+import org.joda.time.Instant;
+import org.joda.time.LocalDate;
+import org.joda.time.LocalDateTime;
+import org.joda.time.format.ISODateTimeFormat;
+
+public final class JodaTimeUtil {
+
+    private JodaTimeUtil() {
+    }
+
+    public static String format(final Instant source) {
+        return ISODateTimeFormat.dateTime().print(source);
+    }
+
+    public static String format(final DateTime source) {
+        return ISODateTimeFormat.dateTime().print(source);
+    }
+
+    public static String format(final LocalDate source) {
+        return ISODateTimeFormat.yearMonthDay().print(source);
+    }
+
+    public static String format(final LocalDateTime source) {
+        return ISODateTimeFormat.dateTime().print(source);
+    }
+
+    public static Instant parseInstant(final String source) {
+        return Instant.parse(source);
+    }
+
+    public static DateTime parseDateTime(final String source) {
+        return DateTime.parse(source);
+    }
+
+    public static LocalDate parseLocalDate(final String source) {
+        return LocalDate.parse(source);
+    }
+
+    public static LocalDateTime parseLocalDateTime(final String source) {
+        return LocalDateTime.parse(source);
+    }
+
+}

src/main/java/com/arangodb/springframework/core/convert/TimeStringConverters.java

@@ -36,7 +36,6 @@
 import org.springframework.data.convert.WritingConverter;
 
 import com.arangodb.velocypack.internal.util.DateUtil;
-import com.arangodb.velocypack.module.jdk8.internal.util.JavaTimeUtil;
 
 /**
  * These date and java.time converters are necessary to override (possibly existing) Spring converters.