From 3de3d357e9e3f37b92f6b1056d8bc4e54310a5f0 Mon Sep 17 00:00:00 2001 From: Jermy Li Date: Sun, 28 Jun 2020 14:59:15 +0800 Subject: [PATCH] bump up common 1.7.8 (#1058) include: guava 25.1 and cassandra-driver 3.6.0 Change-Id: Iaa420dc5233887a5b7054d7ea9f683cb5627903c --- .../hugegraph/api/gremlin/GremlinClient.java | 4 +- hugegraph-cassandra/pom.xml | 2 +- hugegraph-core/pom.xml | 13 +-- .../com/baidu/hugegraph/util/DateUtil.java | 95 ------------------- hugegraph-dist/pom.xml | 5 - .../backend/store/palo/PaloHttpClient.java | 3 +- pom.xml | 2 +- 7 files changed, 13 insertions(+), 111 deletions(-) delete mode 100644 hugegraph-core/src/main/java/com/baidu/hugegraph/util/DateUtil.java diff --git a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java index 55676003b..b3d1d21d3 100644 --- a/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java +++ b/hugegraph-api/src/main/java/com/baidu/hugegraph/api/gremlin/GremlinClient.java @@ -30,11 +30,11 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import com.baidu.hugegraph.api.filter.CompressInterceptor; -import com.baidu.hugegraph.rest.RestClient; +import com.baidu.hugegraph.rest.AbstractRestClient; import com.baidu.hugegraph.testutil.Whitebox; import com.baidu.hugegraph.util.E; -public class GremlinClient extends RestClient { +public class GremlinClient extends AbstractRestClient { private final WebTarget webTarget; diff --git a/hugegraph-cassandra/pom.xml b/hugegraph-cassandra/pom.xml index ebf0dc10a..3e4e88fcd 100644 --- a/hugegraph-cassandra/pom.xml +++ b/hugegraph-cassandra/pom.xml @@ -55,7 +55,7 @@ com.datastax.cassandra cassandra-driver-core - 3.2.0 + 3.6.0 io.netty diff --git a/hugegraph-core/pom.xml b/hugegraph-core/pom.xml index e19b25397..e09192766 100644 --- a/hugegraph-core/pom.xml +++ b/hugegraph-core/pom.xml @@ -19,7 +19,7 @@ com.baidu.hugegraph hugegraph-common - 1.7.6 + 1.7.8 @@ -50,15 +50,16 @@ gremlin-driver - - com.google.guava - guava - - org.caffinitas.ohc ohc-core 0.7.0 + + + com.google.guava + guava + + diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/DateUtil.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/util/DateUtil.java deleted file mode 100644 index 71e89b5e7..000000000 --- a/hugegraph-core/src/main/java/com/baidu/hugegraph/util/DateUtil.java +++ /dev/null @@ -1,95 +0,0 @@ -/* - * Copyright 2017 HugeGraph Authors - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with this - * work for additional information regarding copyright ownership. The ASF - * licenses this file to You 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. - */ - -package com.baidu.hugegraph.util; - -import java.text.ParseException; -import java.util.Date; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -import com.baidu.hugegraph.date.SafeDateFormat; -import com.google.common.collect.ImmutableMap; - -public final class DateUtil { - - public static final Date DATE_ZERO = new Date(0L); - - private static final Map VALID_DFS = ImmutableMap.of( - "^\\d{4}-\\d{1,2}-\\d{1,2}", - "yyyy-MM-dd", - "^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{2}:\\d{2}:\\d{2}", - "yyyy-MM-dd HH:mm:ss", - "^\\d{4}-\\d{1,2}-\\d{1,2}\\s\\d{2}:\\d{2}:\\d{2}\\.\\d{1,3}", - "yyyy-MM-dd HH:mm:ss.SSS" - ); - - private static final Map DATE_FORMATS = - new ConcurrentHashMap<>(); - - public static Date parse(String value) { - for (Map.Entry entry : VALID_DFS.entrySet()) { - if (value.matches(entry.getKey())) { - try { - return parse(value, entry.getValue()); - } catch (ParseException e) { - throw new IllegalArgumentException(String.format( - "%s, expect format: %s", - e.getMessage(), entry.getValue())); - } - } - } - throw new IllegalArgumentException(String.format( - "Expected date format is: %s, but got '%s'", - VALID_DFS.values(), value)); - } - - public static Date parse(String value, String df) throws ParseException { - SafeDateFormat dateFormat = getDateFormat(df); - return dateFormat.parse(value); - } - - public static Date now() { - return new Date(); - } - - private static SafeDateFormat getDateFormat(String df) { - SafeDateFormat dateFormat = DATE_FORMATS.get(df); - if (dateFormat == null) { - dateFormat = new SafeDateFormat(df); - /* - * Specify whether or not date/time parsing is to be lenient. - * With lenient parsing, the parser may use heuristics to interpret - * inputs that do not precisely match this object's format. - * With strict parsing, inputs must match this object's format. - */ - dateFormat.setLenient(false); - SafeDateFormat previous = DATE_FORMATS.putIfAbsent(df, dateFormat); - if (previous != null) { - dateFormat = previous; - } - } - return dateFormat; - } - - public static Object toPattern(String df) { - SafeDateFormat dateFormat = getDateFormat(df); - return dateFormat.toPattern(); - } -} diff --git a/hugegraph-dist/pom.xml b/hugegraph-dist/pom.xml index 49ce1f4b9..582db5ec2 100644 --- a/hugegraph-dist/pom.xml +++ b/hugegraph-dist/pom.xml @@ -64,11 +64,6 @@ hugegraph-postgresql ${project.version} - - io.airlift - airline - 0.6 - org.apache.tinkerpop diff --git a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java index 76c828200..6f46b26f0 100644 --- a/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java +++ b/hugegraph-palo/src/main/java/com/baidu/hugegraph/backend/store/palo/PaloHttpClient.java @@ -26,6 +26,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import com.baidu.hugegraph.config.HugeConfig; +import com.baidu.hugegraph.rest.AbstractRestClient; import com.baidu.hugegraph.rest.RestClient; import com.google.common.collect.ImmutableMap; @@ -60,7 +61,7 @@ public class PaloHttpClient { this.client.put(path, body, headers, params); } - private static class Client extends RestClient { + private static class Client extends AbstractRestClient { private static final int SECOND = 1000; diff --git a/pom.xml b/pom.xml index d4856077e..a48c26f70 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 4.12 3.4.3 2.4 - 19.0 + 25.1-jre 4.5.2 2.25.1 3.1.0