Skip to content

Commit d41cdf7

Browse files
author
Graeme-Miller
authored
Merge pull request #40 from cloudsoft/fix-deprecated-code-usage
Fix deprecated code usage
2 parents 4f15746 + 584564e commit d41cdf7

17 files changed

Lines changed: 35 additions & 34 deletions

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ The example below creates a VM with a new volume:
3232

3333
brooklyn.catalog:
3434
id: my-app.io.cloudsoft.brooklyn-blockstore.new-volume-customizer
35-
version: 0.6.0-SNAPSHOT # BROOKLYN_BLOCKSTORE_VERSION
35+
version: 0.7.0-SNAPSHOT # BROOKLYN_BLOCKSTORE_VERSION
3636
brooklyn.libraries:
37-
- file://~/.m2/repository/io/brooklyn/blockstore/brooklyn-blockstore/0.6.0-SNAPSHOT/brooklyn-blockstore-0.6.0-SNAPSHOT.jar # BROOKLYN_BLOCKSTORE_VERSION
37+
- file://~/.m2/repository/io/brooklyn/blockstore/brooklyn-blockstore/0.7.0-SNAPSHOT/brooklyn-blockstore-0.7.0-SNAPSHOT.jar # BROOKLYN_BLOCKSTORE_VERSION
3838
item:
3939
services:
4040
- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess
@@ -63,10 +63,10 @@ This second example creates a VM that binds to an existing volume:
6363

6464
brooklyn.catalog:
6565
id: my-app.io.cloudsoft.brooklyn-blockstore.ec2-existing-volume-customizer
66-
version: 0.6.0-SNAPSHOT # BROOKLYN_BLOCKSTORE_VERSION
66+
version: 0.7.0-SNAPSHOT # BROOKLYN_BLOCKSTORE_VERSION
6767
name: My App with Ec2ExistingVolumeCustomizer # Not tested recently.
6868
brooklyn.libraries:
69-
- file://~/.m2/repository/io/brooklyn/blockstore/brooklyn-blockstore/0.6.0-SNAPSHOT/brooklyn-blockstore-0.6.0-SNAPSHOT.jar # BROOKLYN_BLOCKSTORE_VERSION
69+
- file://~/.m2/repository/io/brooklyn/blockstore/brooklyn-blockstore/0.7.0-SNAPSHOT/brooklyn-blockstore-0.7.0-SNAPSHOT.jar # BROOKLYN_BLOCKSTORE_VERSION
7070
item:
7171
services:
7272
- type: org.apache.brooklyn.entity.software.base.VanillaSoftwareProcess

‎blockstore/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>io.brooklyn.blockstore</groupId>
1010
<artifactId>brooklyn-blockstore-parent</artifactId>
11-
<version>0.6.0-SNAPSHOT</version> <!-- BROOKLYN_BLOCKSTORE_VERSION -->
11+
<version>0.7.0-SNAPSHOT</version> <!-- BROOKLYN_BLOCKSTORE_VERSION -->
1212
<relativePath>../pom.xml</relativePath>
1313
</parent>
1414

‎blockstore/src/main/java/brooklyn/location/blockstore/AbstractVolumeManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected String getOrMakeName(JcloudsLocation location, BlockDeviceOptions opti
163163
if (!Strings.isNullOrEmpty(options.getName())) {
164164
return options.getName();
165165
} else {
166-
return "volume-" + new JcloudsMachineNamer().generateNewMachineUniqueName(location.getLocalConfigBag());
166+
return "volume-" + new JcloudsMachineNamer().generateNewMachineUniqueName(location.config().getLocalBag());
167167
}
168168
}
169169

‎blockstore/src/main/java/brooklyn/location/blockstore/BlockDeviceOptions.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55

66
import java.util.Map;
77

8-
import com.google.common.base.Objects;
9-
import com.google.common.collect.Maps;
108
import org.apache.brooklyn.util.core.flags.TypeCoercions;
119

10+
import com.google.common.base.MoreObjects;
11+
import com.google.common.collect.Maps;
12+
1213
public class BlockDeviceOptions {
1314

1415
private String name;
@@ -140,7 +141,7 @@ public boolean deleteOnTermination() {
140141

141142
@Override
142143
public String toString() {
143-
return Objects.toStringHelper(this)
144+
return MoreObjects.toStringHelper(this)
144145
.add("name", name)
145146
.add("zone", zone)
146147
.add("tags", tags)

‎blockstore/src/main/java/brooklyn/location/blockstore/Devices.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.slf4j.Logger;
66
import org.slf4j.LoggerFactory;
77

8-
import com.google.common.base.Objects;
8+
import com.google.common.base.MoreObjects;
99

1010
import brooklyn.location.blockstore.api.AttachedBlockDevice;
1111
import brooklyn.location.blockstore.api.BlockDevice;
@@ -52,7 +52,7 @@ public AttachedBlockDeviceImpl attachedTo(JcloudsMachineLocation machine, String
5252

5353
@Override
5454
public String toString() {
55-
return Objects.toStringHelper(this)
55+
return MoreObjects.toStringHelper(this)
5656
.add("id", id)
5757
.add("location", location)
5858
.toString();
@@ -92,7 +92,7 @@ public MountedBlockDevice mountedAt(String mountPoint) {
9292

9393
@Override
9494
public String toString() {
95-
return Objects.toStringHelper(this)
95+
return MoreObjects.toStringHelper(this)
9696
.add("id", getId())
9797
.add("machine", getMachine())
9898
.add("deviceName", getDeviceName())
@@ -116,7 +116,7 @@ public String getMountPoint() {
116116

117117
@Override
118118
public String toString() {
119-
return Objects.toStringHelper(this)
119+
return MoreObjects.toStringHelper(this)
120120
.add("id", getId())
121121
.add("machine", getMachine())
122122
.add("deviceName", getDeviceName())

‎blockstore/src/main/java/brooklyn/location/blockstore/FilesystemOptions.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.util.Map;
66

7-
import com.google.common.base.Objects;
7+
import com.google.common.base.MoreObjects;
88

99
public class FilesystemOptions {
1010

@@ -45,7 +45,7 @@ public String getFilesystemType() {
4545

4646
@Override
4747
public String toString() {
48-
return Objects.toStringHelper(this)
48+
return MoreObjects.toStringHelper(this)
4949
.add("mountPoint", mountPoint)
5050
.add("filesystemType", filesystemType)
5151
.toString();

‎blockstore/src/main/java/brooklyn/location/blockstore/gce/GoogleComputeEngineVolumeManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626

27-
import com.google.common.base.Objects;
27+
import com.google.common.base.MoreObjects;
2828
import com.google.common.collect.ImmutableSet;
2929
import com.google.inject.Module;
3030

@@ -222,7 +222,7 @@ public GCEAttachedBlockDevice attachedTo(JcloudsMachineLocation machine, String
222222

223223
@Override
224224
public String toString() {
225-
return Objects.toStringHelper(this)
225+
return MoreObjects.toStringHelper(this)
226226
.add("id", getId())
227227
.add("location", location)
228228
.toString();
@@ -262,7 +262,7 @@ public MountedBlockDevice mountedAt(String mountPoint) {
262262

263263
@Override
264264
public String toString() {
265-
return Objects.toStringHelper(this)
265+
return MoreObjects.toStringHelper(this)
266266
.add("id", getId())
267267
.add("machine", getMachine())
268268
.add("deviceName", getDeviceName())
@@ -286,7 +286,7 @@ public String getMountPoint() {
286286

287287
@Override
288288
public String toString() {
289-
return Objects.toStringHelper(this)
289+
return MoreObjects.toStringHelper(this)
290290
.add("id", getId())
291291
.add("machine", getMachine())
292292
.add("deviceName", getDeviceName())

‎catalog/catalog.bom‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
brooklyn.catalog:
1818
items:
1919
- id: entity-with-new-volume-customizer
20-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
20+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
2121
name: New Volume Customizer
2222
description: Attaches additional disks in provisioning time
2323
itemType: template
@@ -56,7 +56,7 @@ brooklyn.catalog:
5656
# It would be good to have a brooklyn dsl for list so we do not have to use `customizersConfig`
5757

5858
- id: entity-with-new-volumes-effector
59-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
59+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
6060
name: Entity with New Volumes Effector
6161
description: Attaches additional disks during application runtime time
6262
itemType: template

‎catalog/catalog.tests.bom‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ brooklyn.catalog:
22
items:
33
- https://raw.githubusercontent.com/brooklyncentral/common-catalog-utils/master/common-tests/src/main/resources/commontests/common.tests.bom
44
- id: new-volume-provisioning-customizer-tests
5-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
5+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
66
itemType: template
77
name: New Volume Location Provisioning Customizer Tests
88
item:
@@ -33,7 +33,7 @@ brooklyn.catalog:
3333

3434

3535
- id: new-volume-runtime-effector-tests
36-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
36+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
3737
itemType: template
3838
name: New Volume Effector Tests
3939
description: Attaching additional disks in provisioning time and after provisioning via effector is running correctly
@@ -134,7 +134,7 @@ brooklyn.catalog:
134134
- contains: 24G
135135

136136
- id: new-volume-runtime-effector-tests-unset-suffixes
137-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
137+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
138138
itemType: template
139139
name: New Volume Location Provisioning Customizer Tests (Triple)
140140
item:

‎catalog/tests/new-volume-provisioning-and-runtime-effector-tests-h-g-f-d-c.bom‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
brooklyn.catalog:
22
items:
33
- id: new-volume-provisioning-and-runtime-effector-tests-h-g-f-d-c
4-
version: "0.6.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
4+
version: "0.7.0-SNAPSHOT" # BROOKLYN_BLOCKSTORE_VERSION
55
itemType: template
66
name: New Volume Location Provisioning Customizer and New Volumes from effector Tests
77
item:

0 commit comments

Comments
 (0)