Move deprecated SimulatedLocation to src/test/java
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/b53a79ac Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/b53a79ac Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/b53a79ac Branch: refs/heads/master Commit: b53a79aca5c3170d288302865e639b1d939c0ce6 Parents: 5c1015f Author: Aled Sage <[email protected]> Authored: Tue Jul 28 22:56:38 2015 +0100 Committer: Aled Sage <[email protected]> Committed: Sat Aug 1 00:13:32 2015 +0100 ---------------------------------------------------------------------- .../location/basic/SimulatedLocation.java | 138 ------------------- .../location/basic/SimulatedLocation.java | 136 ++++++++++++++++++ 2 files changed, 136 insertions(+), 138 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b53a79ac/core/src/main/java/brooklyn/location/basic/SimulatedLocation.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/brooklyn/location/basic/SimulatedLocation.java b/core/src/main/java/brooklyn/location/basic/SimulatedLocation.java deleted file mode 100644 index 05d39ce..0000000 --- a/core/src/main/java/brooklyn/location/basic/SimulatedLocation.java +++ /dev/null @@ -1,138 +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 brooklyn.location.basic; - -import java.net.InetAddress; -import java.util.Collection; -import java.util.Map; -import java.util.Set; - -import brooklyn.location.HardwareDetails; -import brooklyn.location.LocationSpec; -import brooklyn.location.MachineDetails; -import brooklyn.location.MachineLocation; -import brooklyn.location.MachineProvisioningLocation; -import brooklyn.location.OsDetails; -import brooklyn.location.PortRange; -import brooklyn.location.PortSupplier; -import brooklyn.util.collections.MutableMap; -import brooklyn.util.net.Networking; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; - - -/** Location for use in dev/test, defining custom start/stop support, and/or tweaking the ports which are permitted to be available - * (using setPermittedPorts(Iterable)) - * - * @deprecated since 0.7.0; will be moved to src/test/java - */ -public class SimulatedLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, MachineLocation, PortSupplier { - - private static final long serialVersionUID = 1L; - - private static final InetAddress address; - static { - address = Networking.getLocalHost(); - } - - Iterable<Integer> permittedPorts = PortRanges.fromString("1+"); - Set<Integer> usedPorts = Sets.newLinkedHashSet(); - - public SimulatedLocation() { - this(MutableMap.<String,Object>of()); - } - public SimulatedLocation(Map<String,? extends Object> flags) { - super(flags); - } - - @Override - public SimulatedLocation newSubLocation(Map<?,?> newFlags) { - // TODO shouldn't have to copy config bag as it should be inherited (but currently it is not used inherited everywhere; just most places) - return getManagementContext().getLocationManager().createLocation(LocationSpec.create(getClass()) - .parent(this) - .configure(config().getLocalBag().getAllConfig()) // FIXME Should this just be inherited? - .configure(newFlags)); - } - - public MachineLocation obtain(Map<?,?> flags) { - return this; - } - - public void release(MachineLocation machine) { - } - - public Map<String,Object> getProvisioningFlags(Collection<String> tags) { - return MutableMap.<String,Object>of(); - } - - public InetAddress getAddress() { - return address; - } - - @Override - public String getHostname() { - String hostname = address.getHostName(); - return (hostname == null || hostname.equals(address.getHostAddress())) ? null : hostname; - } - - @Override - public Set<String> getPublicAddresses() { - return ImmutableSet.of(address.getHostAddress()); - } - - @Override - public Set<String> getPrivateAddresses() { - return ImmutableSet.of(); - } - - public synchronized boolean obtainSpecificPort(int portNumber) { - if (!Iterables.contains(permittedPorts, portNumber)) return false; - if (usedPorts.contains(portNumber)) return false; - usedPorts.add(portNumber); - return true; - } - - public synchronized int obtainPort(PortRange range) { - for (int p: range) - if (obtainSpecificPort(p)) return p; - return -1; - } - - public synchronized void releasePort(int portNumber) { - usedPorts.remove(portNumber); - } - - public synchronized void setPermittedPorts(Iterable<Integer> ports) { - permittedPorts = ports; - } - - @Override - public OsDetails getOsDetails() { - return getMachineDetails().getOsDetails(); - } - - @Override - public MachineDetails getMachineDetails() { - HardwareDetails hardwareDetails = new BasicHardwareDetails(null, null); - OsDetails osDetails = BasicOsDetails.Factory.ANONYMOUS_LINUX; - return new BasicMachineDetails(hardwareDetails, osDetails); - } -} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/b53a79ac/core/src/test/java/brooklyn/location/basic/SimulatedLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/brooklyn/location/basic/SimulatedLocation.java b/core/src/test/java/brooklyn/location/basic/SimulatedLocation.java new file mode 100644 index 0000000..83d5455 --- /dev/null +++ b/core/src/test/java/brooklyn/location/basic/SimulatedLocation.java @@ -0,0 +1,136 @@ +/* + * 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 brooklyn.location.basic; + +import java.net.InetAddress; +import java.util.Collection; +import java.util.Map; +import java.util.Set; + +import brooklyn.location.HardwareDetails; +import brooklyn.location.LocationSpec; +import brooklyn.location.MachineDetails; +import brooklyn.location.MachineLocation; +import brooklyn.location.MachineProvisioningLocation; +import brooklyn.location.OsDetails; +import brooklyn.location.PortRange; +import brooklyn.location.PortSupplier; +import brooklyn.util.collections.MutableMap; +import brooklyn.util.net.Networking; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; + + +/** Location for use in dev/test, defining custom start/stop support, and/or tweaking the ports which are permitted to be available + * (using setPermittedPorts(Iterable)) + */ +public class SimulatedLocation extends AbstractLocation implements MachineProvisioningLocation<MachineLocation>, MachineLocation, PortSupplier { + + private static final long serialVersionUID = 1L; + + private static final InetAddress address; + static { + address = Networking.getLocalHost(); + } + + Iterable<Integer> permittedPorts = PortRanges.fromString("1+"); + Set<Integer> usedPorts = Sets.newLinkedHashSet(); + + public SimulatedLocation() { + this(MutableMap.<String,Object>of()); + } + public SimulatedLocation(Map<String,? extends Object> flags) { + super(flags); + } + + @Override + public SimulatedLocation newSubLocation(Map<?,?> newFlags) { + // TODO shouldn't have to copy config bag as it should be inherited (but currently it is not used inherited everywhere; just most places) + return getManagementContext().getLocationManager().createLocation(LocationSpec.create(getClass()) + .parent(this) + .configure(config().getLocalBag().getAllConfig()) // FIXME Should this just be inherited? + .configure(newFlags)); + } + + public MachineLocation obtain(Map<?,?> flags) { + return this; + } + + public void release(MachineLocation machine) { + } + + public Map<String,Object> getProvisioningFlags(Collection<String> tags) { + return MutableMap.<String,Object>of(); + } + + public InetAddress getAddress() { + return address; + } + + @Override + public String getHostname() { + String hostname = address.getHostName(); + return (hostname == null || hostname.equals(address.getHostAddress())) ? null : hostname; + } + + @Override + public Set<String> getPublicAddresses() { + return ImmutableSet.of(address.getHostAddress()); + } + + @Override + public Set<String> getPrivateAddresses() { + return ImmutableSet.of(); + } + + public synchronized boolean obtainSpecificPort(int portNumber) { + if (!Iterables.contains(permittedPorts, portNumber)) return false; + if (usedPorts.contains(portNumber)) return false; + usedPorts.add(portNumber); + return true; + } + + public synchronized int obtainPort(PortRange range) { + for (int p: range) + if (obtainSpecificPort(p)) return p; + return -1; + } + + public synchronized void releasePort(int portNumber) { + usedPorts.remove(portNumber); + } + + public synchronized void setPermittedPorts(Iterable<Integer> ports) { + permittedPorts = ports; + } + + @Override + public OsDetails getOsDetails() { + return getMachineDetails().getOsDetails(); + } + + @Override + public MachineDetails getMachineDetails() { + HardwareDetails hardwareDetails = new BasicHardwareDetails(null, null); + OsDetails osDetails = BasicOsDetails.Factory.ANONYMOUS_LINUX; + return new BasicMachineDetails(hardwareDetails, osDetails); + } +}
