This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit 10a3755eea55a36be334b92d1a0ac7af6aca051a Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 12:45:41 2021 +0000 fix for guava update --- .../persist/deserializingClassRenames.properties | 1 - .../org/apache/brooklyn/util/guava/TypeTokens.java | 4 +- .../org/apache/brooklyn/util/net/Networking.java | 4 +- .../brooklyn/util/net/UserAndHostAndPort.java | 2 +- .../brooklyn/util/stream/InputStreamSupplier.java | 51 ---------------------- .../apache/brooklyn/util/text/StringFunctions.java | 10 ++--- .../org/apache/brooklyn/util/text/Strings.java | 4 +- .../brooklyn/util/net/UserAndHostAndPortTest.java | 4 +- 8 files changed, 13 insertions(+), 67 deletions(-) diff --git a/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties b/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties index 6d86022..959b76d 100644 --- a/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties +++ b/core/src/main/resources/org/apache/brooklyn/core/mgmt/persist/deserializingClassRenames.properties @@ -1349,7 +1349,6 @@ brooklyn.util.ssh.BashCommands brooklyn.util.ssh.IptablesCommands : org.apache.brooklyn.util.ssh.IptablesCommands brooklyn.util.stream.DelegatingPrintStream : org.apache.brooklyn.util.stream.DelegatingPrintStream brooklyn.util.stream.IllegalOutputStream : org.apache.brooklyn.util.stream.IllegalOutputStream -brooklyn.util.stream.InputStreamSupplier : org.apache.brooklyn.util.stream.InputStreamSupplier brooklyn.util.stream.KnownSizeInputStream : org.apache.brooklyn.util.stream.KnownSizeInputStream brooklyn.util.stream.ReaderInputStream : org.apache.brooklyn.util.stream.ReaderInputStream brooklyn.util.stream.StreamGobbler : org.apache.brooklyn.util.stream.StreamGobbler diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java b/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java index 19ff464..efee27b 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/guava/TypeTokens.java @@ -212,8 +212,8 @@ public class TypeTokens { } // prefer an ancestor (ideally we'd infer generics if needed at the parent, but skip for now) - if (t1.isAssignableFrom(t2)) return t1; - if (t2.isAssignableFrom(t1)) return t2; + if (t1.isSupertypeOf(t2)) return t1; + if (t2.isSupertypeOf(t1)) return t2; if (t1.getRawType().isAssignableFrom(t2.getRawType())) return t1; if (t2.getRawType().isAssignableFrom(t1.getRawType())) return t2; diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java b/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java index 6919257..49a58c7 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/net/Networking.java @@ -440,7 +440,7 @@ public class Networking { /** returns local IP address, or 127.0.0.1 if it cannot be parsed * @deprecated since 0.12.0, as this method has bad defaults (fails on some machines); - * use {@link #getLocalHost(boolean, boolean, boolean, int)} for full control or + * use {@link #getLocalHost(boolean, boolean, boolean, boolean, int)} for full control or * {@link #getReachableLocalHost()} for a method with better defaults and errors */ public static InetAddress getLocalHost() { return getLocalHost(false, true, true, false, 0); @@ -602,7 +602,7 @@ public class Networking { if (timeout>0) { s.setSoTimeout(timeout); } - s.connect(new InetSocketAddress(endpoint.getHostText(), endpoint.getPort()), timeout); + s.connect(new InetSocketAddress(endpoint.getHost(), endpoint.getPort()), timeout); closeQuietly(s); return true; } catch (Exception e) { diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/net/UserAndHostAndPort.java b/utils/common/src/main/java/org/apache/brooklyn/util/net/UserAndHostAndPort.java index 558af0c..64bfea1 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/net/UserAndHostAndPort.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/net/UserAndHostAndPort.java @@ -76,7 +76,7 @@ public class UserAndHostAndPort implements Serializable { @Override public String toString() { - return user + "@" + hostAndPort.getHostText() + (hostAndPort.hasPort() ? ":" + hostAndPort.getPort() : ""); + return user + "@" + hostAndPort.getHost() + (hostAndPort.hasPort() ? ":" + hostAndPort.getPort() : ""); } @Override diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java deleted file mode 100644 index 11be01a..0000000 --- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/InputStreamSupplier.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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 org.apache.brooklyn.util.stream; - -import java.io.IOException; -import java.io.InputStream; - -import com.google.common.io.ByteSource; -import com.google.common.io.InputSupplier; - -/** @deprecated since 0.10.0; underlying guava deprecated; - * guava says to use a {@link ByteSource}; and in many cases there's also a better way */ -@Deprecated -public class InputStreamSupplier implements InputSupplier<InputStream> { - - private final InputStream target; - - private InputStreamSupplier(InputStream target) { - this.target = target; - } - - @Override - public InputStream getInput() throws IOException { - return target; - } - - public static InputStreamSupplier of(InputStream target) { - return new InputStreamSupplier(target); - } - - public static InputStreamSupplier fromString(String input) { - return new InputStreamSupplier(Streams.newInputStreamWithContents(input)); - } - -} diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java b/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java index 13f32fc..0cacfd3 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/text/StringFunctions.java @@ -18,17 +18,15 @@ */ package org.apache.brooklyn.util.text; -import static com.google.common.base.Preconditions.checkNotNull; - -import javax.annotation.Nullable; - import com.google.common.base.CaseFormat; import com.google.common.base.CharMatcher; import com.google.common.base.Function; import com.google.common.base.Functions; import com.google.common.base.Objects; import com.google.common.base.Preconditions; +import static com.google.common.base.Preconditions.checkNotNull; import com.google.common.collect.Iterables; +import javax.annotation.Nullable; public class StringFunctions { @@ -144,7 +142,7 @@ public class StringFunctions { public String apply(@Nullable String input) { if (input == null) return null; if (Strings.isBlank(input)) return Strings.EMPTY; - return CharMatcher.BREAKING_WHITESPACE.trimFrom(input); + return CharMatcher.breakingWhitespace().trimFrom(input); } }; } @@ -362,7 +360,7 @@ public class StringFunctions { public String apply(@Nullable String input) { if (input == null) return null; if (Strings.isBlank(input)) return Strings.EMPTY; - return CharMatcher.BREAKING_WHITESPACE.trimFrom(input); + return CharMatcher.breakingWhitespace().trimFrom(input); } } diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java b/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java index cd72af7..b0a7b91 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/text/Strings.java @@ -82,7 +82,7 @@ public class Strings { * @see #isNonBlank(CharSequence) */ public static boolean isBlank(CharSequence s) { - return isEmpty(s) || CharMatcher.WHITESPACE.matchesAllOf(s); + return isEmpty(s) || CharMatcher.whitespace().matchesAllOf(s); } /** @@ -331,7 +331,7 @@ public class Strings { public static String makeValidFilename(String s) { Preconditions.checkNotNull(s, "Cannot make valid filename from null string"); Preconditions.checkArgument(isNonBlank(s), "Cannot make valid filename from blank string"); - return CharMatcher.anyOf(VALID_NON_ALPHANUM_FILE_CHARS).or(CharMatcher.JAVA_LETTER_OR_DIGIT) + return CharMatcher.anyOf(VALID_NON_ALPHANUM_FILE_CHARS).or(CharMatcher.javaLetterOrDigit()) .negate() .trimAndCollapseFrom(s, '_'); } diff --git a/utils/common/src/test/java/org/apache/brooklyn/util/net/UserAndHostAndPortTest.java b/utils/common/src/test/java/org/apache/brooklyn/util/net/UserAndHostAndPortTest.java index 51df8b2..2bdeaa7 100644 --- a/utils/common/src/test/java/org/apache/brooklyn/util/net/UserAndHostAndPortTest.java +++ b/utils/common/src/test/java/org/apache/brooklyn/util/net/UserAndHostAndPortTest.java @@ -43,9 +43,9 @@ public class UserAndHostAndPortTest { assertEquals(actual.getUser(), user); assertEquals(actual.getHostAndPort(), hostAndPort); if (hostAndPort.hasPort()) { - assertEquals(actual.toString(), user + "@" + hostAndPort.getHostText() + ":" + hostAndPort.getPort()); + assertEquals(actual.toString(), user + "@" + hostAndPort.getHost() + ":" + hostAndPort.getPort()); } else { - assertEquals(actual.toString(), user + "@" + hostAndPort.getHostText()); + assertEquals(actual.toString(), user + "@" + hostAndPort.getHost()); } } }
