You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by tb...@apache.org on 2017/10/18 08:29:05 UTC
[3/7] brooklyn-server git commit: Deletes old deprecated code
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
index 7033398..0ef3812 100644
--- a/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
+++ b/core/src/main/java/org/apache/brooklyn/location/ssh/SshMachineLocation.java
@@ -765,8 +765,9 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
private Map<String, Object> augmentPropertiesWithSshConfigGivenToProps(Map<String, ?> props) {
Map<String,Object> augmentedProps = Maps.newHashMap(props);
for (ConfigKey<?> config : SSH_CONFIG_GIVEN_TO_PROPS) {
- if (!augmentedProps.containsKey(config.getName()) && hasConfig(config, true))
+ if (!augmentedProps.containsKey(config.getName()) && config().getRaw(config).isPresent()) {
augmentedProps.put(config.getName(), getConfig(config));
+ }
}
return augmentedProps;
}
@@ -795,18 +796,6 @@ public class SshMachineLocation extends AbstractLocation implements MachineLocat
}.logger(logSsh);
}
- /**
- * @deprecated since 0.7.0; use {@link #execCommands(Map, String, List, Map), and rely on that calling the execWithLogging
- */
- @SuppressWarnings({"rawtypes", "unchecked"})
- @Deprecated
- protected int execWithLogging(Map<String,?> props, String summaryForLogging, List<String> commands, Map env, final Closure<Integer> execCommand) {
- return newExecWithLoggingHelpers().execWithLogging(props, summaryForLogging, commands, env, new ExecRunner() {
- @Override public int exec(ShellTool ssh, Map<String, ?> flags, List<String> cmds, Map<String, ?> env) {
- return execCommand.call(ssh, flags, cmds, env);
- }});
- }
-
public int copyTo(File src, File destination) {
return copyTo(MutableMap.<String,Object>of(), src, destination);
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java b/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
deleted file mode 100644
index 05b53d3..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/BrooklynLanguageExtensions.java
+++ /dev/null
@@ -1,46 +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.core;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import org.apache.brooklyn.core.internal.BrooklynInitialization;
-
-/** @deprecated since 0.7.0 use {@link BrooklynInitialization} */
-@Deprecated
-public class BrooklynLanguageExtensions {
-
- private BrooklynLanguageExtensions() {}
-
- private static AtomicBoolean done = new AtomicBoolean(false);
-
- public synchronized static void reinit() {
- done.set(false);
- init();
- }
-
- /** performs the language extensions required for this project */
- public synchronized static void init() {
- if (done.getAndSet(true)) return;
- BrooklynInitialization.initPortRanges();
- }
-
- static { BrooklynInitialization.initLegacyLanguageExtensions(); }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
index 88bb4ad..ecc50b4 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/ResourceUtils.java
@@ -23,7 +23,6 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.MalformedURLException;
@@ -33,16 +32,26 @@ import java.net.URL;
import java.net.URLDecoder;
import java.util.List;
import java.util.NoSuchElementException;
-import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.classloading.BrooklynClassLoadingContext;
-import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.catalog.internal.BasicBrooklynCatalog.BrooklynLoaderTracker;
+import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.internal.BrooklynInitialization;
import org.apache.brooklyn.core.mgmt.classloading.JavaBrooklynClassLoadingContext;
+import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.collections.MutableMap;
+import org.apache.brooklyn.util.core.text.DataUriSchemeParser;
+import org.apache.brooklyn.util.exceptions.Exceptions;
+import org.apache.brooklyn.util.http.HttpTool;
+import org.apache.brooklyn.util.http.HttpTool.HttpClientBuilder;
+import org.apache.brooklyn.util.net.Urls;
+import org.apache.brooklyn.util.os.Os;
+import org.apache.brooklyn.util.osgi.OsgiUtils;
+import org.apache.brooklyn.util.stream.Streams;
+import org.apache.brooklyn.util.text.Strings;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.auth.Credentials;
@@ -52,25 +61,12 @@ import org.apache.http.client.methods.HttpGet;
import org.apache.http.util.EntityUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.brooklyn.location.ssh.SshMachineLocation;
-import org.apache.brooklyn.util.collections.MutableMap;
-import org.apache.brooklyn.util.http.HttpTool;
-import org.apache.brooklyn.util.http.HttpTool.HttpClientBuilder;
-import org.apache.brooklyn.util.core.text.DataUriSchemeParser;
-import org.apache.brooklyn.util.exceptions.Exceptions;
-import org.apache.brooklyn.util.javalang.Threads;
-import org.apache.brooklyn.util.net.Urls;
-import org.apache.brooklyn.util.os.Os;
-import org.apache.brooklyn.util.stream.Streams;
-import org.apache.brooklyn.util.text.Strings;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
-import org.apache.brooklyn.util.osgi.OsgiUtils;
-
public class ResourceUtils {
private static final Logger log = LoggerFactory.getLogger(ResourceUtils.class);
@@ -347,21 +343,6 @@ public class ResourceUtils {
}
}
- /** @deprecated since 0.7.0; use method {@link Os#mergePaths(String...)} */ @Deprecated
- public static String mergeFilePaths(String... items) {
- return Os.mergePaths(items);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#tidyPath(String)} */ @Deprecated
- public static String tidyFilePath(String path) {
- return Os.tidyPath(path);
- }
-
- /** @deprecated since 0.7.0; use method {@link Urls#getProtocol(String)} */ @Deprecated
- public static String getProtocol(String url) {
- return Urls.getProtocol(url);
- }
-
private InputStream getResourceViaClasspath(String url) throws IOException {
assert url.startsWith("classpath:");
String subUrl = url.substring("classpath:".length());
@@ -561,50 +542,4 @@ public class ResourceUtils {
public static URL getContainerUrl(URL url, String resourceInThatDir) {
return OsgiUtils.getContainerUrl(url, resourceInThatDir);
}
-
- /** @deprecated since 0.7.0 use {@link Streams#copy(InputStream, OutputStream)} */ @Deprecated
- public static void copy(InputStream input, OutputStream output) throws IOException {
- Streams.copy(input, output);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File mkdirs(File dir) {
- return Os.mkdirs(dir);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File writeToTempFile(InputStream is, String prefix, String suffix) {
- return Os.writeToTempFile(is, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use same method in {@link Os} */ @Deprecated
- public static File writeToTempFile(InputStream is, File tempDir, String prefix, String suffix) {
- return Os.writeToTempFile(is, tempDir, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#writePropertiesToTempFile(Properties, String, String)} */ @Deprecated
- public static File writeToTempFile(Properties props, String prefix, String suffix) {
- return Os.writePropertiesToTempFile(props, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Os#writePropertiesToTempFile(Properties, File, String, String)} */ @Deprecated
- public static File writeToTempFile(Properties props, File tempDir, String prefix, String suffix) {
- return Os.writePropertiesToTempFile(props, tempDir, prefix, suffix);
- }
-
- /** @deprecated since 0.7.0; use method {@link Threads#addShutdownHook(Runnable)} */ @Deprecated
- public static Thread addShutdownHook(final Runnable task) {
- return Threads.addShutdownHook(task);
- }
- /** @deprecated since 0.7.0; use method {@link Threads#removeShutdownHook(Thread)} */ @Deprecated
- public static boolean removeShutdownHook(Thread hook) {
- return Threads.removeShutdownHook(hook);
- }
-
- /** returns the items with exactly one "/" between items (whether or not the individual items start or end with /),
- * except where character before the / is a : (url syntax) in which case it will permit multiple (will not remove any)
- * @deprecated since 0.7.0 use either {@link Os#mergePathsUnix(String...)} {@link Urls#mergePaths(String...) */ @Deprecated
- public static String mergePaths(String ...items) {
- return Urls.mergePaths(items);
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java b/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
index 1075cf1..5d77e32 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/config/ConfigBag.java
@@ -132,7 +132,7 @@ public class ConfigBag {
/** @deprecated since 0.7.0, not used; kept only for rebind compatibility where the inner class is used
* (now replaced by a static class above) */
@Beta @Deprecated
- public static ConfigBag newInstanceWithInnerClass(final ConfigBag configBag, Map<?,?> optionalAdditionalValues) {
+ private static ConfigBag newInstanceWithInnerClass(final ConfigBag configBag, Map<?,?> optionalAdditionalValues) {
return new ConfigBag() {
@Override
public void markUsed(String key) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java b/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
index 5a1e54a..30aa0cb 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/crypto/SecureKeys.java
@@ -131,7 +131,15 @@ public class SecureKeys extends SecureKeysWithoutBouncyCastle {
* this starts -----BEGIN PRIVATE KEY----- and ends similarly, like id_rsa.
* also see {@link #readPem(byte[], String)} */
public static String toPem(KeyPair key) {
- return stringPem(key);
+ try {
+ StringWriter sw = new StringWriter();
+ PEMWriter w = new PEMWriter(sw);
+ w.writeObject(key);
+ w.close();
+ return sw.toString();
+ } catch (IOException e) {
+ throw Throwables.propagate(e);
+ }
}
/** returns id_rsa.pub style file, of public key */
@@ -143,17 +151,4 @@ public class SecureKeys extends SecureKeysWithoutBouncyCastle {
public static PublicKey fromPub(String pubText) {
return AuthorizedKeysParser.decodePublicKey(pubText);
}
-
- /** @deprecated since 0.7.0, use {@link #toPem(KeyPair)} */ @Deprecated
- public static String stringPem(KeyPair key) {
- try {
- StringWriter sw = new StringWriter();
- PEMWriter w = new PEMWriter(sw);
- w.writeObject(key);
- w.close();
- return sw.toString();
- } catch (IOException e) {
- throw Throwables.propagate(e);
- }
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
index 5213d8e..19cecac 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/file/ArchiveBuilder.java
@@ -147,39 +147,6 @@ public class ArchiveBuilder {
}
/**
- * Add the file located at the {@code filePath} to the archive,
- * with some complicated base-name strategies.
- *
- * @deprecated since 0.7.0 use one of the other add methods which makes the strategy explicit */ @Deprecated
- public ArchiveBuilder add(String filePath) {
- checkNotNull(filePath, "filePath");
- return add(new File(Os.tidyPath(filePath)));
- }
-
- /**
- * Add the {@code file} to the archive.
- * <p>
- * If the file path is absolute, or points to a file above the current directory,
- * the file is added to the archive as a top-level entry, using the file name only.
- * For relative {@code filePath}s below the current directory, the file is added
- * using the path given and is assumed to be located relative to the current
- * working directory.
- * <p>
- * No checks for file existence are made at this stage.
- *
- * @see #entry(String, File)
- * @deprecated since 0.7.0 use one of the other add methods which makes the strategy explicit */ @Deprecated
- public ArchiveBuilder add(File file) {
- checkNotNull(file, "file");
- String filePath = Os.tidyPath(file.getPath());
- if (file.isAbsolute() || filePath.startsWith("../")) {
- return entry(Os.mergePaths(".", file.getName()), file);
- } else {
- return entry(Os.mergePaths(".", filePath), file);
- }
- }
-
- /**
* Add a file located at the {@code fileSubPath}, relative to the {@code baseDir} on the local system,
* as {@code fileSubPath} in the archive. For most archives directories are supported.
* <p>
@@ -199,16 +166,6 @@ public class ArchiveBuilder {
checkNotNull(fileSubPath, "filePath");
return entry(fileSubPath, Os.mergePaths(baseDir.getPath(), fileSubPath));
}
- /** @deprecated since 0.7.0 use {@link #addFromLocalBaseDir(File, String)}, or
- * one of the other add methods if adding relative to baseDir was not intended */ @Deprecated
- public ArchiveBuilder addFromLocalBaseDir(String baseDir, String fileSubPath) {
- return addFromLocalBaseDir(new File(baseDir), fileSubPath);
- }
- /** @deprecated since 0.7.0 use {@link #addFromLocalBaseDir(File, String)}, or
- * one of the other add methods if adding relative to baseDir was not intended */ @Deprecated
- public ArchiveBuilder add(String baseDir, String fileSubPath) {
- return addFromLocalBaseDir(baseDir, fileSubPath);
- }
/**
* Adds the given file or directory to the archive, preserving its name but putting under the given directory in the archive (may be <code>""</code> or <code>"./"</code>).
@@ -228,16 +185,6 @@ public class ArchiveBuilder {
}
/**
- * Add the contents of the directory named {@code dirName} to the archive.
- *
- * @see #addDir(File)
- * @deprecated since 0.7.0 use {@link #addDirContentsAt(File, String) */ @Deprecated
- public ArchiveBuilder addDir(String dirName) {
- checkNotNull(dirName, "dirName");
- return addDir(new File(Os.tidyPath(dirName)));
- }
-
- /**
* Add the contents of the directory {@code dir} to the archive.
* The directory's name is not included; use {@link #addAt(File, String)} with <code>""</code> as the second argument if you want that behavior.
*
@@ -254,45 +201,6 @@ public class ArchiveBuilder {
}
/**
- * As {@link #addDirContentsAt(File, String)},
- * using {@literal .} as the parent directory name for the contents.
- *
- * @deprecated since 0.7.0 use {@link #addDirContentsAt(File, String)
- * to clarify API, argument types, and be explicit about where it should be installed,
- * because JARs seem to require <code>""<code> whereas ZIPs might want <code>"./"</code>. */ @Deprecated
- public ArchiveBuilder addDir(File dir) {
- return addDirContentsAt(dir, ".");
- }
-
- /**
- * Add the collection of {@code files} to the archive.
- *
- * @see #add(String)
- * @deprecated since 0.7.0 use one of the other add methods if keeping this file's path was not intended */ @Deprecated
- public ArchiveBuilder add(Iterable<String> files) {
- checkNotNull(files, "files");
- for (String filePath : files) {
- add(filePath);
- }
- return this;
- }
-
- /**
- * Add the collection of {@code files}, relative to the {@code baseDir}, to
- * the archive.
- *
- * @see #add(String, String)
- * @deprecated since 0.7.0 use one of the other add methods if keeping this file's path was not intended */ @Deprecated
- public ArchiveBuilder add(String baseDir, Iterable<String> files) {
- checkNotNull(baseDir, "baseDir");
- checkNotNull(files, "files");
- for (String filePath : files) {
- add(baseDir, filePath);
- }
- return this;
- }
-
- /**
* Add the {@code file} to the archive with the path {@code entryPath}.
*
* @see #entry(String, File)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
index 589dc4f..4ee4930 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/flags/FlagUtils.java
@@ -146,13 +146,6 @@ public class FlagUtils {
}
/** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
- * using the indicated flags/config-bag
- * @deprecated since 0.7.0 use {@link #setAllConfigKeys(Map, Configurable, boolean)} */
- @Deprecated
- public static Map<String, ?> setAllConfigKeys(Map<String, ?> flagsOrConfig, Configurable instance) {
- return setAllConfigKeys(flagsOrConfig, instance, false);
- }
- /** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
* using the indicated flags/config-bag */
public static Map<String, ?> setAllConfigKeys(Map<String, ?> flagsOrConfig, Configurable instance, boolean includeFlags) {
ConfigBag bag = new ConfigBag().putAll(flagsOrConfig);
@@ -161,13 +154,6 @@ public class FlagUtils {
}
/** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
- * using the indicated flags/config-bag
- * @deprecated since 0.7.0 use {@link #setAllConfigKeys(Configurable, ConfigBag, boolean)} */
- @Deprecated
- public static void setAllConfigKeys(Configurable o, ConfigBag bag) {
- setAllConfigKeys(o, bag, false);
- }
- /** sets _all_ accessible _{@link ConfigKey}_ and {@link HasConfigKey} fields on the given object,
* using the indicated flags/config-bag */
public static void setAllConfigKeys(Configurable o, ConfigBag bag, boolean includeFlags) {
for (Field f: getAllFields(o.getClass())) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
deleted file mode 100644
index 3837d69..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpTool.java
+++ /dev/null
@@ -1,28 +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.core.http;
-
-
-
-/**
- * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpTool}.
- */
-@Deprecated
-public class HttpTool {
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java b/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
deleted file mode 100644
index 1343c08..0000000
--- a/core/src/main/java/org/apache/brooklyn/util/core/http/HttpToolResponse.java
+++ /dev/null
@@ -1,31 +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.core.http;
-
-
-/**
- * @deprecated since 0.9.0. Prefer {@link org.apache.brooklyn.util.http.HttpToolResponse}.
- *
- * @see {@link HttpTool}
- */
-@Deprecated
-public class HttpToolResponse {
-
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
index 94c8609..785c58e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/SshTool.java
@@ -103,15 +103,6 @@ public interface SshTool extends ShellTool {
*/
public void connect();
- /**
- * @deprecated since 0.7.0; (since much earlier) this ignores the argument in favour of {@link #PROP_SSH_TRIES}
- *
- * @param maxAttempts
- * @throws SshException
- */
- @Deprecated
- public void connect(int maxAttempts);
-
public void disconnect();
public boolean isConnected();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
index e0bb94d..19dccdc 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/cli/SshCliTool.java
@@ -110,11 +110,6 @@ public class SshCliTool extends SshAbstractTool implements SshTool {
}
@Override
- public void connect(int maxAttempts) {
- // no-op
- }
-
- @Override
public void disconnect() {
if (LOG.isTraceEnabled()) LOG.trace("Disconnecting SshCliTool {} ({}) - no-op", this, System.identityHashCode(this));
// no-op
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
index 75d761b..7a5464e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/process/ProcessTool.java
@@ -122,23 +122,6 @@ public class ProcessTool extends ShellAbstractTool implements ShellTool {
return asInt(execProcesses(allcmds, env, directoryDir, out, err, separator, getOptionalVal(props, PROP_LOGIN_SHELL), this), -1);
}
- /**
- * as {@link #execProcesses(List, Map, OutputStream, OutputStream, String, boolean, Object)} but not using a login shell
- * @deprecated since 0.7; use {@link #execProcesses(List, Map, File, OutputStream, OutputStream, String, boolean, Object)}
- */
- @Deprecated
- public static int execProcesses(List<String> cmds, Map<String,?> env, OutputStream out, OutputStream err, String separator, Object contextForLogging) {
- return execProcesses(cmds, env, (File)null, out, err, separator, false, contextForLogging);
- }
-
- /**
- * @deprecated since 0.7; use {@link #execProcesses(List, Map, File, OutputStream, OutputStream, String, boolean, Object)}
- */
- @Deprecated
- public static int execProcesses(List<String> cmds, Map<String,?> env, OutputStream out, OutputStream err, String separator, boolean asLoginShell, Object contextForLogging) {
- return execProcesses(cmds, env, (File)null, out, err, separator, asLoginShell, contextForLogging);
- }
-
/** executes a set of commands by sending them as a single process to `bash -c`
* (single command argument of all the commands, joined with separator)
* <p>
@@ -152,14 +135,6 @@ public class ProcessTool extends ShellAbstractTool implements ShellTool {
return execSingleProcess(commands, env, directory, out, err, contextForLogging);
}
- /**
- * @deprecated since 0.7; use {@link #execSingleProcess(List, Map, File, OutputStream, OutputStream, Object)}
- */
- @Deprecated
- public static int execSingleProcess(List<String> cmdWords, Map<String,?> env, OutputStream out, OutputStream err, Object contextForLogging) {
- return execSingleProcess(cmdWords, env, (File)null, out, err, contextForLogging);
- }
-
/** executes a single process made up of the given command words (*not* bash escaped);
* should be portable across OS's */
public static int execSingleProcess(List<String> cmdWords, Map<String,?> env, File directory, OutputStream out, OutputStream err, Object contextForLogging) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
index a9ed010..385513e 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/internal/ssh/sshj/SshjTool.java
@@ -210,12 +210,6 @@ public class SshjTool extends SshAbstractTool implements SshTool {
}
@Override
- @Deprecated // see super
- public void connect(int maxAttempts) {
- connect(); // FIXME Should callers instead configure sshTries? But that would apply to all ssh attempts
- }
-
- @Override
public void disconnect() {
if (LOG.isTraceEnabled()) LOG.trace("Disconnecting SshjTool {} ({})", this, System.identityHashCode(this));
try {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
index d87bcf8..374eb5d 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/BundleMaker.java
@@ -110,8 +110,6 @@ public class BundleMaker {
addUrlItemRecursively(zout, path, path, Predicates.alwaysTrue());
}
- Streams.closeQuietly(zout);
-
return f;
} catch (Exception e) {
@@ -298,15 +296,17 @@ public class BundleMaker {
Exceptions.propagateIfFatal(e);
return false;
}
-
- if (isKnownNotToBeADirectoryListing(item) || !
+ try {
// can't reliably tell if item a file or a folder (listing files), esp w classpath where folder is treated as a list of files,
// so if we can't tell try it as a list of files; not guaranteed, and empty dir and a file of size 0 will appear identical, but better than was
// (mainly used for tests)
- addUrlDirToZipRecursively(zout, root, item, itemFound, filter)) {
- addUrlFileToZip(zout, root, item, filter);
+ if (isKnownNotToBeADirectoryListing(item) || !addUrlDirToZipRecursively(zout, root, item, itemFound, filter)) {
+ addUrlFileToZip(zout, root, item, filter);
+ }
+ return true;
+ } finally {
+ Streams.closeQuietly(itemFound);
}
- return true;
}
private boolean isKnownNotToBeADirectoryListing(String item) {
@@ -348,13 +348,6 @@ public class BundleMaker {
}
private void addUrlFileToZip(ZipOutputStream zout, String root, String item, Predicate<? super String> filter) throws IOException {
- InputStream itemFound = null;
- try {
- itemFound = resources.getResourceFromUrl(item);
- } catch (Exception e) {
- throw Exceptions.propagate(e);
- }
-
int startPos = item.indexOf(root);
if (startPos<0) {
throw new IllegalStateException("URL of "+item+" does not appear relative to root "+root);
@@ -370,11 +363,20 @@ public class BundleMaker {
if (!filter.apply(itemE)) {
return;
}
- ZipEntry e = new ZipEntry(itemE);
- zout.putNextEntry(e);
- Streams.copy(itemFound, zout);
- Streams.closeQuietly(itemFound);
- zout.closeEntry();
+
+ InputStream itemFound = null;
+ try {
+ itemFound = resources.getResourceFromUrl(item);
+
+ ZipEntry e = new ZipEntry(itemE);
+ zout.putNextEntry(e);
+ Streams.copy(itemFound, zout);
+ zout.closeEntry();
+ } catch (Exception e) {
+ throw Exceptions.propagate(e);
+ } finally {
+ Streams.closeQuietly(itemFound);
+ }
}
/** Creates a temporary file with the given metadata */
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
index db459ae..6d7651a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/osgi/Osgis.java
@@ -26,7 +26,6 @@ import java.net.URISyntaxException;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import java.util.Map;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
@@ -287,39 +286,6 @@ public class Osgis {
return new BundleFinder(framework);
}
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static List<Bundle> getBundlesByName(Framework framework, String symbolicName, Predicate<Version> versionMatcher) {
- return bundleFinder(framework).symbolicName(symbolicName).version(versionMatcher).findAll();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static List<Bundle> getBundlesByName(Framework framework, String symbolicName) {
- return bundleFinder(framework).symbolicName(symbolicName).findAll();
- }
-
- /**
- * Tries to find a bundle in the given framework with name matching either `name' or `name:version'.
- * @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicNameOptionallyWithVersion) {
- return bundleFinder(framework).id(symbolicNameOptionallyWithVersion).find();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicName, String version) {
- return bundleFinder(framework).symbolicName(symbolicName).version(version).find();
- }
-
- /** @deprecated since 0.7.0 use {@link #bundleFinder(Framework)} */ @Deprecated
- public static Maybe<Bundle> getBundle(Framework framework, String symbolicName, Version version) {
- return bundleFinder(framework).symbolicName(symbolicName).version(Predicates.equalTo(version)).findUnique();
- }
-
- /** @deprecated since 0.9.0, replaced by {@link #getFramework(java.lang.String, boolean) } */
- @Deprecated
- public static Framework newFrameworkStarted(String felixCacheDir, boolean clean, Map<?,?> extraStartupConfig) {
- return getFramework(felixCacheDir, clean);
- }
-
/**
* Provides an OSGI framework.
*
@@ -346,20 +312,6 @@ public class Osgis {
SystemFrameworkLoader.get().ungetFramework(framework);
}
-
-
- /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(org.osgi.framework.Bundle) } */
- @Deprecated
- public static String getVersionedId(Bundle b) {
- return OsgiUtils.getVersionedId(b);
- }
-
- /** @deprecated since 0.9.0, replaced with {@link OsgiUtils#getVersionedId(java.util.jar.Manifest) } */
- @Deprecated
- public static String getVersionedId(Manifest manifest) {
- return OsgiUtils.getVersionedId(manifest);
- }
-
/**
* Installs a bundle from the given URL, doing a check if already installed, and
* using the {@link ResourceUtils} loader for this project (brooklyn core)
@@ -450,16 +402,9 @@ public class Osgis {
return ResourceUtils.create(Osgis.class).getResourceFromUrl(url);
}
- /** @deprecated since 0.9.0, replaced with {@code SystemFrameworkLoader.get().isSystemBundle(bundle)} */
- @Deprecated
- public static boolean isExtensionBundle(Bundle bundle) {
- return SystemFrameworkLoader.get().isSystemBundle(bundle);
- }
-
@Beta
public static Optional<Bundle> getBundleOf(Class<?> clazz) {
Bundle bundle = org.osgi.framework.FrameworkUtil.getBundle(clazz);
return Optional.fromNullable(bundle);
}
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
index 816065e..aaf5b87 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskBuilder.java
@@ -52,14 +52,6 @@ public class TaskBuilder<T> {
return new TaskBuilder<T>();
}
- /**
- * @deprecated since 0.8.0; use {@link #displayName(String)}
- */
- @Deprecated
- public TaskBuilder<T> name(String name) {
- return displayName(name);
- }
-
public TaskBuilder<T> displayName(String displayName) {
this.displayName = displayName;
return this;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
index ee34fb7..9cdb57a 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/task/TaskPredicates.java
@@ -28,12 +28,6 @@ import com.google.common.base.Predicates;
public class TaskPredicates {
- /** @deprecated since 0.9.0; use {@link #displayNameSatisfies(Predicate)} */
- @Deprecated
- public static Predicate<Task<?>> displayNameMatches(Predicate<? super String> matcher) {
- return displayNameSatisfies(matcher);
- }
-
/**
* @since 0.9.0
*/
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
index 923f733..c3b8246 100644
--- a/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
+++ b/core/src/main/java/org/apache/brooklyn/util/core/text/TemplateProcessor.java
@@ -74,11 +74,6 @@ public class TemplateProcessor {
return ObjectWrapper.DEFAULT_WRAPPER.wrap(o);
}
- /** @deprecated since 0.7.0 use {@link #processTemplateFile(String, Map)} */ @Deprecated
- public static String processTemplate(String templateFileName, Map<String, ? extends Object> substitutions) {
- return processTemplateFile(templateFileName, substitutions);
- }
-
/** As per {@link #processTemplateContents(String, Map)}, but taking a file. */
public static String processTemplateFile(String templateFileName, Map<String, ? extends Object> substitutions) {
String templateContents;
@@ -91,11 +86,6 @@ public class TemplateProcessor {
return processTemplateContents(templateContents, substitutions);
}
- /** @deprecated since 0.7.0 use {@link #processTemplateFile(String, EntityDriver, Map)} */ @Deprecated
- public static String processTemplate(String templateFileName, EntityDriver driver, Map<String, ? extends Object> extraSubstitutions) {
- return processTemplateFile(templateFileName, driver, extraSubstitutions);
- }
-
/** Processes template contents according to {@link EntityAndMapTemplateModel}. */
public static String processTemplateFile(String templateFileName, EntityDriver driver, Map<String, ? extends Object> extraSubstitutions) {
String templateContents;
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
index 049916c..0ef9232 100644
--- a/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/BrooklynVersionTest.java
@@ -52,13 +52,6 @@ public class BrooklynVersionTest {
}
@Test
- public void testGetHardcodedClasspathVersion() {
- @SuppressWarnings("deprecation")
- String v = BrooklynVersion.INSTANCE.getVersionFromClasspath();
- assertTrue(BrooklynVersion.get().equals(v) || "0.0.0-SNAPSHOT".equals(v), v);
- }
-
- @Test
public void testGetFromMaven() {
String v = BrooklynVersion.INSTANCE.getVersionFromMavenProperties();
assertTrue(v == null || BrooklynVersion.get().equals(v), v);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
index f930b6e..8ba271b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/catalog/internal/CatalogItemBuilderTest.java
@@ -100,16 +100,6 @@ public class CatalogItemBuilderTest {
}
@Test
- public void testNameReplacedByDisplayName() {
- final CatalogEntityItemDto catalogItem = CatalogItemBuilder.newEntity(symbolicName, version)
- .name(name)
- .displayName(displayName)
- .build();
-
- assertEquals(catalogItem.getName(), displayName);
- }
-
- @Test
public void testBuiltEntity() {
final CatalogEntityItemDto catalogItem = CatalogItemBuilder.newEntity(symbolicName, version)
.javaType(javaType)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
index d802892..77bfa7c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/BrooklynPropertiesTest.java
@@ -148,18 +148,18 @@ public class BrooklynPropertiesTest {
public void testGetSubMap() {
BrooklynProperties props = BrooklynProperties.Factory.newEmpty().addFromMap(ImmutableMap.of(
"a.key", "aval", "a.key2", "aval2", "akey", "noval", "b.key", "bval"));
- BrooklynProperties p2 = props.submap(ConfigPredicates.matchingGlob("a.*"));
+ BrooklynProperties p2 = props.submap(ConfigPredicates.nameMatchesGlob("a.*"));
assertEquals(p2.getAllConfig().keySet().size(), 2, "wrong size submap: "+p2);
assertEquals(p2.getFirst("a.key"), "aval");
assertEquals(p2.getFirst("b.key"), null);
assertEquals(p2.getFirst("akey"), null);
- BrooklynProperties p3a = props.submap(ConfigPredicates.startingWith("a."));
+ BrooklynProperties p3a = props.submap(ConfigPredicates.nameStartsWith("a."));
assertPropertiesEquals(p3a, p2);
- BrooklynProperties p3b = props.submap(ConfigPredicates.matchingRegex("a\\..*"));
+ BrooklynProperties p3b = props.submap(ConfigPredicates.nameMatchesRegex("a\\..*"));
assertPropertiesEquals(p3b, p2);
- BrooklynProperties p4 = props.submap(ConfigPredicates.matchingRegex("a.*"));
+ BrooklynProperties p4 = props.submap(ConfigPredicates.nameMatchesRegex("a.*"));
assertEquals(p4.getAllConfig().keySet().size(), 3, "wrong size submap: "+p4);
assertEquals(p4.getFirst("a.key"), "aval");
assertEquals(p4.getFirst("b.key"), null);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
index e9bc9b5..e85968a 100644
--- a/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/config/ConfigPredicatesTest.java
@@ -32,27 +32,21 @@ public class ConfigPredicatesTest extends BrooklynAppUnitTestSupport {
private final ConfigKey<String> STR1 = ConfigKeys.newStringConfigKey("test.str1");
@Test
- public void testNameMatchingPredicate() throws Exception {
- assertTrue(ConfigPredicates.nameMatching(Predicates.equalTo("test.str1")).apply(STR1));
- assertFalse(ConfigPredicates.nameMatching(Predicates.equalTo("wrong")).apply(STR1));
- }
-
- @Test
public void testNameMatchingGlob() throws Exception {
- assertTrue(ConfigPredicates.matchingGlob("*str*").apply(STR1));
- assertFalse(ConfigPredicates.matchingGlob("*wrong*").apply(STR1));
+ assertTrue(ConfigPredicates.nameMatchesGlob("*str*").apply(STR1));
+ assertFalse(ConfigPredicates.nameMatchesGlob("*wrong*").apply(STR1));
}
@Test
public void testNameMatchingRegex() throws Exception {
- assertTrue(ConfigPredicates.matchingRegex(".*str.*").apply(STR1));
- assertFalse(ConfigPredicates.matchingRegex(".*wrong.*").apply(STR1));
+ assertTrue(ConfigPredicates.nameMatchesRegex(".*str.*").apply(STR1));
+ assertFalse(ConfigPredicates.nameMatchesRegex(".*wrong.*").apply(STR1));
}
@Test
public void testNameStartingWith() throws Exception {
- assertTrue(ConfigPredicates.startingWith("test.s").apply(STR1));
- assertFalse(ConfigPredicates.startingWith("wrong.s").apply(STR1));
+ assertTrue(ConfigPredicates.nameStartsWith("test.s").apply(STR1));
+ assertFalse(ConfigPredicates.nameStartsWith("wrong.s").apply(STR1));
}
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
index e4e5699..f259ba7 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/AttributeTest.java
@@ -19,7 +19,6 @@
package org.apache.brooklyn.core.entity;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNull;
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.sensor.AttributeSensor;
@@ -54,14 +53,4 @@ public class AttributeTest extends BrooklynAppUnitTestSupport {
public void missingAttributeIsNull() {
assertEquals(entity.getAttribute(COLOR), null);
}
-
- @Test
- public void canGetAttributeByNameParts() {
- // Initially null
- assertNull(entityImpl.getAttributeByNameParts(COLOR.getNameParts()));
-
- // Once set, returns val
- entity.sensors().set(COLOR, "red");
- assertEquals(entityImpl.getAttributeByNameParts(COLOR.getNameParts()), "red");
- }
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
index 80ae563..909e8f8 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitiesTest.java
@@ -107,12 +107,6 @@ public class EntitiesTest extends BrooklynAppUnitTestSupport {
assertEquals(Entities.attributeSupplier(entity, TestEntity.NAME).get(), "myname");
}
- @Test
- public void testAttributeSupplierUsingTuple() throws Exception {
- entity.sensors().set(TestEntity.NAME, "myname");
- assertEquals(Entities.attributeSupplier(EntityAndAttribute.supplier(entity, TestEntity.NAME)).get(), "myname");
- }
-
@Test(groups="Integration") // takes 1 second
public void testAttributeSupplierWhenReady() throws Exception {
final AtomicReference<String> result = new AtomicReference<String>();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
index 40d66be..faa619c 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityConfigGroovyTest.groovy
@@ -58,7 +58,7 @@ public class EntityConfigGroovyTest extends BrooklynAppUnitTestSupport {
@Test
public void testGetConfigOfPredicateTaskReturnsCoercedClosure() throws Exception {
MyOtherEntity entity2 = app.addChild(EntitySpec.create(MyOtherEntity.class));
- entity2.setConfig(MyOtherEntity.PREDICATE_KEY, { return it != null } );
+ entity2.config().set(MyOtherEntity.PREDICATE_KEY, { return it != null } );
Predicate<?> predicate = entity2.getConfig(MyOtherEntity.PREDICATE_KEY);
assertTrue(predicate instanceof Predicate, "predicate="+predicate);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
index fb84693..c679d00 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySpecTest.java
@@ -31,7 +31,6 @@ import org.apache.brooklyn.config.ConfigKey;
import org.apache.brooklyn.core.config.BasicConfigKey;
import org.apache.brooklyn.core.config.ConfigKeys;
import org.apache.brooklyn.core.enricher.AbstractEnricher;
-import org.apache.brooklyn.core.location.SimulatedLocation;
import org.apache.brooklyn.core.policy.AbstractPolicy;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.TestEntity;
@@ -48,14 +47,12 @@ import com.google.common.collect.Iterables;
public class EntitySpecTest extends BrooklynAppUnitTestSupport {
- private SimulatedLocation loc;
private TestEntity entity;
@BeforeMethod(alwaysRun=true)
@Override
public void setUp() throws Exception {
super.setUp();
- loc = new SimulatedLocation();
}
@Test
@@ -96,15 +93,6 @@ public class EntitySpecTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAddsPolicy() throws Exception {
- MyPolicy policy = new MyPolicy();
- entity = app.createAndManageChild(EntitySpec.create(TestEntity.class)
- .policy(policy));
-
- assertEquals(Iterables.getOnlyElement(entity.policies()), policy);
- }
-
- @Test
public void testAddsEnricherSpec() throws Exception {
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class, TestEntityNoEnrichersImpl.class)
.enricher(EnricherSpec.create(MyEnricher.class)
@@ -119,15 +107,6 @@ public class EntitySpecTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAddsEnricher() throws Exception {
- MyEnricher enricher = new MyEnricher();
- entity = app.createAndManageChild(EntitySpec.create(TestEntity.class, TestEntityNoEnrichersImpl.class)
- .enricher(enricher));
-
- assertEquals(Iterables.getOnlyElement(entity.enrichers()), enricher);
- }
-
- @Test
public void testAddsMembers() throws Exception {
entity = app.createAndManageChild(EntitySpec.create(TestEntity.class));
BasicGroup group = app.createAndManageChild(EntitySpec.create(BasicGroup.class)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
index e7cf727..8354253 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityTypeTest.java
@@ -210,7 +210,7 @@ public class EntityTypeTest extends BrooklynAppUnitTestSupport {
@Test
public void testRemoveSensorThroughEntity() throws Exception{
entity.sensors().set(TEST_SENSOR, "abc");
- entity.removeAttribute(TEST_SENSOR);
+ entity.sensors().remove(TEST_SENSOR);
assertFalse(entity.getEntityType().getSensors().contains(TEST_SENSOR), "sensors="+entity.getEntityType().getSensors());
assertEquals(entity.getAttribute(TEST_SENSOR), null);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
index 59d126f..c4341ef 100644
--- a/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/entity/PolicyRegistrationTest.java
@@ -81,13 +81,6 @@ public class PolicyRegistrationTest extends BrooklynAppUnitTestSupport {
}
@Test(expectedExceptions = { UnsupportedOperationException.class })
- @SuppressWarnings("deprecation")
- public void testGetPoliciesReturnsImmutableCollection() {
- entity.getPolicies().add(new MyPolicy());
- fail();
- }
-
- @Test(expectedExceptions = { UnsupportedOperationException.class })
public void testPoliciesAsListReturnsImmutableCollection() {
entity.policies().asList().add(new MyPolicy());
fail();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java b/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
index fb6cb16..b5cd674 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationConfigTest.java
@@ -63,8 +63,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("mylocation.myconfig", "myval1", "mylocation.myconfigwithflagname", "myval2"));
}
// TODO Note difference compared to Location, where both flag-name + config-key-name are in the ConfigBag
@@ -76,8 +74,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("mylocation.myconfigwithflagname", "myval", "myconfigflagname", "myval"));
}
@Test
@@ -87,8 +83,6 @@ public class LocationConfigTest {
assertEquals(loc.config().getBag().getAllConfig(), ImmutableMap.of("notThere", "notThereVal"));
assertEquals(loc.config().getLocalBag().getAllConfig(), ImmutableMap.of("notThere", "notThereVal"));
- Assert.assertEquals(loc.getAllConfig(true), ImmutableMap.of("notThere", "notThereVal"));
- Assert.assertEquals(loc.getAllConfig(false), ImmutableMap.of("notThere", "notThereVal"));
}
// TODO Note difference from entity: child's bag contains both the flag-name and the config-key-name
@@ -103,8 +97,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfig", "myval1", "notThere", "notThereVal"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfig", "myval1", "notThere", "notThereVal"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
// Fails for location, but passes (or used to pass) for entity; not worth fixing here; locations will soon be entities, we hope
@@ -119,8 +111,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "myval"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "myval"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
@Test
@@ -133,8 +123,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mylocation.myconfig", "myval1"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of());
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mylocation.myconfig", "myval1"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of());
}
@Test
@@ -150,8 +138,6 @@ public class LocationConfigTest {
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "notThere", "overrideNotThereVal"));
}
// TODO Note difference compared to Location, where both flag-name + config-key-name are in the ConfigBag
@@ -168,8 +154,6 @@ public class LocationConfigTest {
log.info("all="+child.config().getBag());
assertEquals(child.config().getBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
assertEquals(child.config().getLocalBag().getAllConfig(), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
- Assert.assertEquals(child.getAllConfig(true), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
- Assert.assertEquals(child.getAllConfig(false), ImmutableMap.of("mychildlocation.myconfigwithflagname", "overrideMyval", "mychildconfigflagname", "overrideMyval"));
}
@Test
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
index 3e36f7a..51149d5 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/MachinesTest.java
@@ -73,15 +73,6 @@ public class MachinesTest extends BrooklynAppUnitTestSupport {
}
@Test
- @SuppressWarnings("deprecation")
- public void testFindUniqueSshMachineLocation() throws Exception {
- SshMachineLocation l1 = create(sshMachineSpec);
- LocalhostMachineProvisioningLocation l2 = create(otherLocSpec);
- assertEquals(Machines.findUniqueSshMachineLocation(ImmutableList.of(l1, l2)).get(), l1);
- assertFalse(Machines.findUniqueSshMachineLocation(ImmutableList.of(l2)).isPresent());
- }
-
- @Test
public void testFindUniqueMachineLocationOfType() throws Exception {
SshMachineLocation l1 = create(sshMachineSpec);
LocalhostMachineProvisioningLocation l2 = create(otherLocSpec);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
index 798f591..f7b1e43 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java
@@ -131,32 +131,6 @@ public class PortForwardManagerRebindTest extends RebindTestFixtureWithApp {
}
@Test
- public void testAssociationPreservedOnRebindLegacy() throws Exception {
- String publicIpId = "5.6.7.8";
- String publicAddress = "5.6.7.8";
-
- TestEntity origEntity = origApp.createAndManageChild(EntitySpec.create(TestEntity.class).impl(MyEntity.class));
- PortForwardManager origPortForwardManager = origEntity.getConfig(MyEntity.PORT_FORWARD_MANAGER);
-
- // We first wait for persisted, to ensure that it is the PortForwardManager.onChanged that is causing persistence.
- RebindTestUtils.waitForPersisted(origApp);
- origPortForwardManager.recordPublicIpHostname(publicIpId, publicAddress);
- origPortForwardManager.acquirePublicPortExplicit(publicIpId, 40080);
- origPortForwardManager.associate(publicIpId, 40080, origSimulatedMachine, 80);
-
- newApp = rebind();
-
- // After rebind, confirm that lookups still work
- TestEntity newEntity = (TestEntity) Iterables.find(newApp.getChildren(), Predicates.instanceOf(TestEntity.class));
- Location newSimulatedMachine = newApp.getManagementContext().getLocationManager().getLocation(origSimulatedMachine.getId());
- PortForwardManager newPortForwardManager = newEntity.getConfig(MyEntity.PORT_FORWARD_MANAGER);
-
- assertEquals(newPortForwardManager.getPublicIpHostname(publicIpId), publicAddress);
- assertEquals(newPortForwardManager.lookup(newSimulatedMachine, 80), HostAndPort.fromParts(publicAddress, 40080));
- assertEquals(newPortForwardManager.lookup(publicIpId, 80), HostAndPort.fromParts(publicAddress, 40080));
- }
-
- @Test
public void testAcquirePortCounterPreservedOnRebindLegacy() throws Exception {
String publicIpId = "5.6.7.8";
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
index aef2d41..095648b 100644
--- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java
@@ -22,30 +22,28 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNotEquals;
import static org.testng.Assert.assertNull;
-import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.brooklyn.util.net.Networking;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Test;
import org.apache.brooklyn.api.location.LocationSpec;
import org.apache.brooklyn.core.entity.Entities;
import org.apache.brooklyn.core.internal.BrooklynProperties;
-import org.apache.brooklyn.core.location.access.PortForwardManager;
import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport;
import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests;
import org.apache.brooklyn.location.ssh.SshMachineLocation;
+import org.apache.brooklyn.util.net.Networking;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
import com.google.common.base.Predicate;
import com.google.common.net.HostAndPort;
public class PortForwardManagerTest extends BrooklynAppUnitTestSupport {
+ @SuppressWarnings("unused")
private static final Logger log = LoggerFactory.getLogger(PortForwardManagerTest.class);
- private Map<HostAndPort, HostAndPort> portMapping;
private SshMachineLocation machine1;
private SshMachineLocation machine2;
private PortForwardManager pfm;
@@ -145,19 +143,6 @@ public class PortForwardManagerTest extends BrooklynAppUnitTestSupport {
}
@Test
- public void testAssociateLegacy() throws Exception {
- String publicIpId = "myipid";
- String publicAddress = "5.6.7.8";
-
- pfm.acquirePublicPortExplicit(publicIpId, 40080);
- pfm.recordPublicIpHostname(publicIpId, publicAddress);
- pfm.associate(publicIpId, 40080, machine1, 80);
-
- assertEquals(pfm.lookup(publicIpId, 80), HostAndPort.fromParts(publicAddress, 40080));
- assertEquals(pfm.lookup(machine1, 80), HostAndPort.fromParts(publicAddress, 40080));
- }
-
- @Test
public void testAssociationListeners() throws Exception {
final AtomicInteger associationCreatedCount = new AtomicInteger(0);
final AtomicInteger associationDeletedCount = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
deleted file mode 100644
index 208a3d0..0000000
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/ha/ManagementPlaneSyncRecordPersisterInMemory.java
+++ /dev/null
@@ -1,99 +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.core.mgmt.ha;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.io.IOException;
-import java.util.concurrent.TimeoutException;
-
-import org.apache.brooklyn.api.mgmt.ha.ManagementNodeSyncRecord;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecord;
-import org.apache.brooklyn.api.mgmt.ha.ManagementPlaneSyncRecordPersister;
-import org.apache.brooklyn.core.mgmt.ha.ManagementPlaneSyncRecordPersisterToObjectStore;
-import org.apache.brooklyn.core.mgmt.persist.InMemoryObjectStore;
-import org.apache.brooklyn.util.time.Duration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.annotations.VisibleForTesting;
-
-/** @deprecated since 0.7.0 use {@link ManagementPlaneSyncRecordPersisterToObjectStore}
- * with {@link InMemoryObjectStore}
- * <code>
- * new ManagementPlaneSyncRecordPersisterToObjectStore(new InMemoryObjectStore(), classLoader)
- * </code> */
-@Deprecated
-public class ManagementPlaneSyncRecordPersisterInMemory implements ManagementPlaneSyncRecordPersister {
-
- private static final Logger LOG = LoggerFactory.getLogger(ManagementPlaneSyncRecordPersisterInMemory.class);
-
- private final MutableManagementPlaneSyncRecord memento = new MutableManagementPlaneSyncRecord();
-
- private volatile boolean running = true;
-
- @Override
- public synchronized void stop() {
- running = false;
- }
-
- @Override
- public ManagementPlaneSyncRecord loadSyncRecord() throws IOException {
- if (!running) {
- throw new IllegalStateException("Persister not running; cannot load memento");
- }
-
- return memento.snapshot();
- }
-
- @VisibleForTesting
- @Override
- public synchronized void waitForWritesCompleted(Duration timeout) throws InterruptedException, TimeoutException {
- // The synchronized is sufficient - guarantee that no concurrent calls
- return;
- }
-
- @Override
- public synchronized void delta(Delta delta) {
- if (!running) {
- if (LOG.isDebugEnabled()) LOG.debug("Persister not running; ignoring checkpointed delta of manager-memento");
- return;
- }
-
- for (ManagementNodeSyncRecord m : delta.getNodes()) {
- memento.addNode(m);
- }
- for (String id : delta.getRemovedNodeIds()) {
- memento.deleteNode(id);
- }
- switch (delta.getMasterChange()) {
- case NO_CHANGE:
- break; // no-op
- case SET_MASTER:
- memento.setMasterNodeId(checkNotNull(delta.getNewMasterOrNull()));
- break;
- case CLEAR_MASTER:
- memento.setMasterNodeId(null);
- break; // no-op
- default:
- throw new IllegalStateException("Unknown state for master-change: "+delta.getMasterChange());
- }
- }
-
-}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
index 113c6c5..a8599b1 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindEnricherTest.java
@@ -124,7 +124,6 @@ public class RebindEnricherTest extends RebindTestFixtureWithApp {
EntityAsserts.assertAttributeEqualsEventually(newApp, METRIC2, "myval");
}
- @SuppressWarnings("unchecked")
@Test
public void testCombiningEnricher() throws Exception {
origApp.enrichers().add(Enrichers.builder()
@@ -307,14 +306,14 @@ public class RebindEnricherTest extends RebindTestFixtureWithApp {
@Test
public void testEntityCreatingItsEnricherDoesNotReCreateItUnlessUniqueTagDifferent() throws Exception {
TestEntity e1 = origApp.createAndManageChild(EntitySpec.create(TestEntity.class, MyTestEntityWithEnricher.class));
- Collection<Enricher> e1e = e1.getEnrichers();
+ Collection<Enricher> e1e = e1.enrichers().asList();
log.info("enrichers1: "+e1e);
Entities.dumpInfo(e1);
assertEquals(e1e.size(), 5);
newApp = rebind();
Entity e2 = Iterables.getOnlyElement( Entities.descendantsAndSelf(newApp, EntityPredicates.idEqualTo(e1.getId())) );
- Collection<Enricher> e2e = e2.getEnrichers();
+ Collection<Enricher> e2e = e2.enrichers().asList();
log.info("enrichers2: "+e2e);
Entities.dumpInfo(e2);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
index 85c99d5..6362a14 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindFeedWithHaTest.java
@@ -110,7 +110,7 @@ public class RebindFeedWithHaTest extends RebindTestFixtureWithApp {
}).runRequiringTrue();
newManagementContext = createNewManagementContext();
- newApp = (TestApplication) RebindTestUtils.rebind(newManagementContext, classLoader);
+ newApp = (TestApplication) RebindTestUtils.rebind(RebindOptions.create().newManagementContext(newManagementContext).classLoader(classLoader));
TestEntity newEntity = (TestEntity) Iterables.getOnlyElement(newApp.getChildren());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
index c7d97a9..3a99234 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestFixture.java
@@ -18,16 +18,11 @@
*/
package org.apache.brooklyn.core.mgmt.rebind;
-import static org.testng.Assert.assertEquals;
-
import java.io.File;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.Callable;
-import org.apache.brooklyn.api.catalog.BrooklynCatalog;
-import org.apache.brooklyn.api.catalog.CatalogItem;
import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.mgmt.ManagementContext;
import org.apache.brooklyn.api.mgmt.Task;
@@ -35,9 +30,7 @@ import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode;
import org.apache.brooklyn.api.mgmt.rebind.RebindExceptionHandler;
import org.apache.brooklyn.api.mgmt.rebind.RebindManager;
import org.apache.brooklyn.api.mgmt.rebind.mementos.BrooklynMementoManifest;
-import org.apache.brooklyn.core.catalog.internal.CatalogUtils;
import org.apache.brooklyn.core.entity.Entities;
-import org.apache.brooklyn.core.entity.EntityFunctions;
import org.apache.brooklyn.core.entity.EntityPredicates;
import org.apache.brooklyn.core.entity.StartableApplication;
import org.apache.brooklyn.core.entity.trait.Startable;
@@ -56,10 +49,6 @@ import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
-import com.google.common.collect.FluentIterable;
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Sets;
-
public abstract class RebindTestFixture<T extends StartableApplication> {
private static final Logger LOG = LoggerFactory.getLogger(RebindTestFixture.class);
@@ -241,52 +230,6 @@ public abstract class RebindTestFixture<T extends StartableApplication> {
return rebind(RebindOptions.create());
}
- /**
- * Checking serializable is overly strict.
- * State only needs to be xstream-serializable, which does not require `implements Serializable`.
- * Also, the xstream serializer has some special hooks that replaces an entity reference with
- * a marker for that entity, etc.
- *
- * @deprecated since 0.7.0; use {@link #rebind()} or {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(boolean checkSerializable) throws Exception {
- return rebind(RebindOptions.create().checkSerializable(checkSerializable));
- }
-
- /**
- * Checking serializable is overly strict.
- * State only needs to be xstream-serializable, which does not require `implements Serializable`.
- * Also, the xstream serializer has some special hooks that replaces an entity reference with
- * a marker for that entity, etc.
- *
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(boolean checkSerializable, boolean terminateOrigManagementContext) throws Exception {
- return rebind(RebindOptions.create()
- .checkSerializable(checkSerializable)
- .terminateOrigManagementContext(terminateOrigManagementContext));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create().exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)})
- */
- @Deprecated
- protected T rebind(ManagementContext newManagementContext, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .exceptionHandler(exceptionHandler));
- }
-
@SuppressWarnings("unchecked")
protected T rebind(RebindOptions options) throws Exception {
if (newApp != null || newManagementContext != null) {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7df1d382/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
index ba0ece2..e6d0ad1 100644
--- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
+++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindTestUtils.java
@@ -308,75 +308,6 @@ public class RebindTestUtils {
.mementoDir(mementoDir)
.classLoader(classLoader));
}
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, ClassLoader classLoader) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Application rebind(ManagementContext newManagementContext, File mementoDir,
- ClassLoader classLoader, RebindExceptionHandler exceptionHandler, PersistenceObjectStore objectStore) throws Exception {
- return rebind(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler)
- .objectStore(objectStore));
- }
public static Application rebind(RebindOptions options) throws Exception {
boolean hadApps = true;
@@ -401,62 +332,6 @@ public class RebindTestUtils {
}
}
- /**
- * @deprecated since 0.7.0; use {@link #rebindAll(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(File mementoDir, ClassLoader classLoader) throws Exception {
- return rebindAll(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebindAll(RebindOptions.create()
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(LocalManagementContext newManagementContext, ClassLoader classLoader, RebindExceptionHandler exceptionHandler) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader));
- }
-
- /**
- * @deprecated since 0.7.0; use {@link #rebind(RebindOptions)}
- */
- @Deprecated
- public static Collection<Application> rebindAll(ManagementContext newManagementContext, File mementoDir, ClassLoader classLoader, RebindExceptionHandler exceptionHandler, PersistenceObjectStore objectStore) throws Exception {
- return rebindAll(RebindOptions.create()
- .newManagementContext(newManagementContext)
- .mementoDir(mementoDir)
- .classLoader(classLoader)
- .exceptionHandler(exceptionHandler)
- .objectStore(objectStore));
- }
-
public static Collection<Application> rebindAll(RebindOptions options) throws Exception {
File mementoDir = options.mementoDir;
File mementoDirBackup = options.mementoDirBackup;