[1/2] brooklyn-client git commit: Add missing @Override annotation to method signatures overriding interface methods
Repository: brooklyn-client
Updated Branches:
refs/heads/master 8ecbfe786 -> 88bb5e7bd
Add missing @Override annotation to method signatures overriding interface
methods
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/ee595623
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/ee595623
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/ee595623
Branch: refs/heads/master
Commit: ee59562307d9305b4c4d08b897285076c6d5ff7e
Parents: 8ecbfe7
Author: Svetoslav Neykov
Authored: Fri Jan 20 16:07:33 2017 +0200
Committer: Svetoslav Neykov
Committed: Fri Feb 3 18:52:58 2017 +0200
--
.../brooklyn/rest/client/ApplicationResourceIntegrationTest.java | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-client/blob/ee595623/java/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java
--
diff --git
a/java/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java
b/java/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java
index 81d789f..df91ba8 100644
---
a/java/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java
+++
b/java/src/test/java/org/apache/brooklyn/rest/client/ApplicationResourceIntegrationTest.java
@@ -162,6 +162,7 @@ public class ApplicationResourceIntegrationTest {
Assert.assertNotNull(response);
try {
Asserts.succeedsEventually(ImmutableMap.of("timeout",
Duration.minutes(1)), new Runnable() {
+@Override
public void run() {
try {
ApplicationSummary summary =
api.getApplicationApi().get("redis-app");
@@ -182,6 +183,7 @@ public class ApplicationResourceIntegrationTest {
private void assertServiceStateEventually(final String app, final String
entity, final Lifecycle state, Duration timeout) {
Asserts.succeedsEventually(ImmutableMap.of("timeout", timeout), new
Runnable() {
+@Override
public void run() {
Object status = api.getSensorApi().get(app, entity,
"service.state", false);
assertTrue(state.toString().equalsIgnoreCase(status.toString()),
"status="+status);
[2/2] brooklyn-client git commit: This closes #37
This closes #37 Add missing @Override annotations and other cleanup Project: http://git-wip-us.apache.org/repos/asf/brooklyn-client/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-client/commit/88bb5e7b Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-client/tree/88bb5e7b Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-client/diff/88bb5e7b Branch: refs/heads/master Commit: 88bb5e7bda81869ff4957e7f50ada7decbaf1dbe Parents: 8ecbfe7 ee59562 Author: Sam Corbett Authored: Mon Feb 6 14:58:15 2017 + Committer: Sam Corbett Committed: Mon Feb 6 14:58:15 2017 + -- .../brooklyn/rest/client/ApplicationResourceIntegrationTest.java | 2 ++ 1 file changed, 2 insertions(+) --
[2/2] brooklyn-library git commit: This closes #72
This closes #72 Fix test to work on any combination of OS & eol type. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/f3cbc42e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/f3cbc42e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/f3cbc42e Branch: refs/heads/master Commit: f3cbc42e7b87c12a56d158dcd52a531f0fd3943e Parents: a72962b a59863f Author: Sam Corbett Authored: Mon Feb 6 14:57:12 2017 + Committer: Sam Corbett Committed: Mon Feb 6 14:57:12 2017 + -- .../dns/geoscaling/GeoscalingScriptGenerator.java | 14 +++--- .../geoscaling/GeoscalingScriptGeneratorTest.java | 18 +++--- 2 files changed, 22 insertions(+), 10 deletions(-) --
[1/2] brooklyn-library git commit: Fix test to work on any combination of OS & eol type.
Repository: brooklyn-library
Updated Branches:
refs/heads/master a72962bee -> f3cbc42e7
Fix test to work on any combination of OS & eol type.
Change line endings for generated script as it's most likely to run in a unix
environment.
Normalize line endings when comparing scripts to work with any combination of
OS & line endings (for tests running on Windows mostly). On Windows you can
have both CRLF or LF line endings in the files (or even mixed), depending on
how git is configured. That's out of our control so try to support any
environment.
The recommended confgiuration is "git --global core.autocrlf true", but Apache
Jenkins machines have "core.autocrlf" set to "input". The former will lead to
CRLF line endings, the latter to LF line endings on checkout.
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a59863f0
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a59863f0
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a59863f0
Branch: refs/heads/master
Commit: a59863f0a653840067ad6ab63d7475d4af1fa402
Parents: f1ff646
Author: Svetoslav Neykov
Authored: Tue Nov 1 18:38:47 2016 +0200
Committer: Svetoslav Neykov
Committed: Tue Nov 1 18:38:47 2016 +0200
--
.../dns/geoscaling/GeoscalingScriptGenerator.java | 14 +++---
.../geoscaling/GeoscalingScriptGeneratorTest.java | 18 +++---
2 files changed, 22 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a59863f0/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
--
diff --git
a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
index 1d1f4f5..367afbb 100644
---
a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
+++
b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGenerator.java
@@ -54,18 +54,18 @@ public class GeoscalingScriptGenerator {
private static String getHostsDeclaration(Collection hosts) {
StringBuffer sb = new StringBuffer();
-sb.append("$hosts = array(").append(Os.LINE_SEPARATOR);
+sb.append("$hosts = array(\n");
Iterator iServer = hosts.iterator();
while (iServer.hasNext()) {
HostGeoInfo server = iServer.next();
-sb.append("array('name' =>
'").append(escape(server.displayName)).append("',").append(Os.LINE_SEPARATOR);
-sb.append(" 'latitude' =>
").append(server.latitude).append(",").append(Os.LINE_SEPARATOR);
-sb.append(" 'longitude' =>
").append(server.longitude).append(",").append(Os.LINE_SEPARATOR);
+sb.append("array('name' =>
'").append(escape(server.displayName)).append("',\n");
+sb.append(" 'latitude' =>
").append(server.latitude).append(",\n");
+sb.append(" 'longitude' =>
").append(server.longitude).append(",\n");
sb.append(" 'ip'=>
'").append(escape(server.address)).append("')");
-if (iServer.hasNext()) sb.append(",").append(Os.LINE_SEPARATOR);
-sb.append(Os.LINE_SEPARATOR);
+if (iServer.hasNext()) sb.append(",\n");
+sb.append("\n");
}
-sb.append(");").append(Os.LINE_SEPARATOR);
+sb.append(");").append("\n");
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a59863f0/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
--
diff --git
a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
index 4e8ef2c..627feee 100644
---
a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
+++
b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingScriptGeneratorTest.java
@@ -48,10 +48,22 @@ public class GeoscalingScriptGeneratorTest {
String generatedScript =
GeoscalingScriptGenerator.generateScriptString(generationTime, HOSTS);
assertTrue(generatedScript.contains("1.2.3"));
String expectedScript =
ResourceUtils.create(this).getResourceAsString("org/apache/brooklyn/entity/dns/geoscaling/expectedScrip
[1/2] brooklyn-server git commit: BROOKLYN-425: softwareProcess.rebind execs with entity context
Repository: brooklyn-server
Updated Branches:
refs/heads/master 55ec074f4 -> 5c5d578f4
BROOKLYN-425: softwareProcess.rebind execs with entity context
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d9e4c6f3
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d9e4c6f3
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d9e4c6f3
Branch: refs/heads/master
Commit: d9e4c6f3e7ffa6bd5c17c99bc6c6c9d4690b1ae6
Parents: 0570ca5
Author: Aled Sage
Authored: Thu Jan 12 18:16:49 2017 +
Committer: Aled Sage
Committed: Tue Jan 24 15:42:08 2017 +
--
.../entity/machine/AddMachineMetrics.java | 2 +-
.../software/base/SoftwareProcessImpl.java | 42 +++---
.../machine/MachineEntityJcloudsRebindTest.java | 142 +++
.../entity/machine/MachineEntityRebindTest.java | 20 ++-
4 files changed, 179 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d9e4c6f3/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
--
diff --git
a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
index 5746f60..a89e479 100644
---
a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
+++
b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
@@ -88,6 +88,7 @@ public class AddMachineMetrics implements EntityInitializer {
public static SshFeed createMachineMetricsFeed(EntityLocal entity) {
boolean retrieveUsageMetrics =
entity.config().get(SoftwareProcess.RETRIEVE_USAGE_METRICS);
return SshFeed.builder()
+.uniqueTag("machineMetricsFeed")
.period(Duration.THIRTY_SECONDS)
.entity(entity)
.poll(SshPollConfig.forSensor(MachineAttributes.UPTIME)
@@ -159,5 +160,4 @@ public class AddMachineMetrics implements EntityInitializer
{
}))
.build();
}
-
}
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d9e4c6f3/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
--
diff --git
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
index 0d2661e..595be97 100644
---
a/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
+++
b/software/base/src/main/java/org/apache/brooklyn/entity/software/base/SoftwareProcessImpl.java
@@ -18,25 +18,12 @@
*/
package org.apache.brooklyn.entity.software.base;
-import groovy.time.TimeDuration;
-
import java.util.Collection;
import java.util.Map;
import java.util.Set;
-import java.util.Timer;
-import java.util.TimerTask;
import java.util.concurrent.Callable;
import java.util.concurrent.TimeUnit;
-import org.apache.brooklyn.location.jclouds.networking.NetworkingEffectors;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterables;
-
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityLocal;
import org.apache.brooklyn.api.entity.drivers.DriverDependentEntity;
@@ -60,17 +47,29 @@ import org.apache.brooklyn.core.location.LocationConfigKeys;
import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
import org.apache.brooklyn.feed.function.FunctionFeed;
import org.apache.brooklyn.feed.function.FunctionPollConfig;
+import org.apache.brooklyn.location.jclouds.networking.NetworkingEffectors;
import org.apache.brooklyn.location.ssh.SshMachineLocation;
import org.apache.brooklyn.util.collections.MutableMap;
import org.apache.brooklyn.util.collections.MutableSet;
import org.apache.brooklyn.util.core.config.ConfigBag;
+import org.apache.brooklyn.util.core.task.BasicTask;
import org.apache.brooklyn.util.core.task.DynamicTasks;
+import org.apache.brooklyn.util.core.task.ScheduledTask;
import org.apache.brooklyn.util.core.task.Tasks;
import org.apache.brooklyn.util.exceptions.Exceptions;
import org.apache.brooklyn.util.guava.Maybe;
import org.apache.brooklyn.util.time.CountdownTimer;
import org.apache.brooklyn.util.time.Duration;
import org.apache.brooklyn.util.time.Time;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+im
[2/2] brooklyn-server git commit: This closes #534
This closes #534
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5c5d578f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5c5d578f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5c5d578f
Branch: refs/heads/master
Commit: 5c5d578f4e3c53e065cc84104fe7a4456ff5d764
Parents: 55ec074 d9e4c6f
Author: Duncan Godwin
Authored: Mon Feb 6 12:35:41 2017 +
Committer: Duncan Godwin
Committed: Mon Feb 6 12:35:41 2017 +
--
.../entity/machine/AddMachineMetrics.java | 2 +-
.../software/base/SoftwareProcessImpl.java | 42 +++---
.../machine/MachineEntityJcloudsRebindTest.java | 142 +++
.../entity/machine/MachineEntityRebindTest.java | 20 ++-
4 files changed, 179 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/5c5d578f/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
--
diff --cc
software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
index 5fafa44,a89e479..8c6d5d0
---
a/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
+++
b/software/base/src/main/java/org/apache/brooklyn/entity/machine/AddMachineMetrics.java
@@@ -86,9 -85,10 +86,10 @@@ public class AddMachineMetrics implemen
}
-public static SshFeed createMachineMetricsFeed(EntityLocal entity) {
+public static SshFeed createMachineMetricsFeed(Entity entity) {
boolean retrieveUsageMetrics =
entity.config().get(SoftwareProcess.RETRIEVE_USAGE_METRICS);
return SshFeed.builder()
+ .uniqueTag("machineMetricsFeed")
.period(Duration.THIRTY_SECONDS)
.entity(entity)
.poll(SshPollConfig.forSensor(MachineAttributes.UPTIME)
[1/4] brooklyn-server git commit: Compile with jdk 8
Repository: brooklyn-server
Updated Branches:
refs/heads/master 68a07aa10 -> 55ec074f4
Compile with jdk 8
- minor source changes (generics)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/a560c7cf
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/a560c7cf
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/a560c7cf
Branch: refs/heads/master
Commit: a560c7cfa3229816a511e4f7e57aa548f876d29a
Parents: 7f1846c
Author: Guglielmo Nigri
Authored: Tue Dec 13 16:19:01 2016 +0100
Committer: Guglielmo Nigri
Committed: Tue Dec 13 17:13:38 2016 +0100
--
.../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++---
.../core/config/MapListAndOtherStructuredConfigKeyTest.java| 6 +++---
.../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a560c7cf/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
--
diff --git
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index 7274b2e..cfe5878 100644
---
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@ -486,8 +486,8 @@ public class DslComponent extends
BrooklynDslDeferredSupplier {
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target
entity not available");
EntityInternal targetEntity = (EntityInternal)
targetEntityMaybe.get();
-ConfigKey key =
targetEntity.getEntityType().getConfigKey(keyName);
-Maybe result =
targetEntity.config().getNonBlocking(key != null ? key :
ConfigKeys.newConfigKey(Object.class, keyName));
+ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
+Maybe result = targetEntity.config().getNonBlocking(key != null ?
key : ConfigKeys.newConfigKey(Object.class, keyName));
return Maybe.cast(result);
}
@@ -501,7 +501,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier {
@Override
public Object call() throws Exception {
Entity targetEntity = component.get();
-ConfigKey key =
targetEntity.getEntityType().getConfigKey(keyName);
+ConfigKey key =
targetEntity.getEntityType().getConfigKey(keyName);
return targetEntity.getConfig(key != null ? key :
ConfigKeys.newConfigKey(Object.class, keyName));
}})
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/a560c7cf/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
--
diff --git
a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
index bfe1126..3e2d9c6 100644
---
a/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
+++
b/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java
@@ -225,7 +225,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends
BrooklynAppUnitTestS
@Test
public void testSetConfigKeyClear() throws Exception {
entity.config().set(TestEntity.CONF_SET_THING.subKey(), "aval");
-entity.config().set((ConfigKey)TestEntity.CONF_SET_THING,
SetModifications.clearing());
+entity.config().set((ConfigKey)TestEntity.CONF_SET_THING, (Object)
SetModifications.clearing());
// for now defaults to null, but empty list might be better? or
whatever the default is?
assertEquals(entity.getConfig(TestEntity.CONF_SET_THING), null);
}
@@ -286,7 +286,7 @@ public class MapListAndOtherStructuredConfigKeyTest extends
BrooklynAppUnitTestS
@Test // ListConfigKey deprecated, as order no longer guaranteed
public void testListConfigKeyClear() throws Exception {
entity.config().set(TestEntity.CONF_LIST_THING.subKey(), "aval");
-entity.config().set((ConfigKey)TestEntity.CONF_LIST_THING,
ListModifications.clearing());
+entity.config().set((ConfigKey)TestEntity.CONF_LIST_THING, (Object)
ListM
[2/4] brooklyn-server git commit: Reinstate generics
Reinstate generics
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f0f64f2b
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f0f64f2b
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f0f64f2b
Branch: refs/heads/master
Commit: f0f64f2bf09a1f2f3bcf2747a9e291afcd9dc8ab
Parents: a560c7c
Author: Guglielmo Nigri
Authored: Wed Dec 14 11:21:35 2016 +0100
Committer: Guglielmo Nigri
Committed: Wed Dec 14 11:33:27 2016 +0100
--
.../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++---
pom.xml| 2 +-
.../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
--
diff --git
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
index cfe5878..3d5fbf0 100644
---
a/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
+++
b/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java
@@ -486,8 +486,8 @@ public class DslComponent extends
BrooklynDslDeferredSupplier {
if (targetEntityMaybe.isAbsent()) return Maybe.absent("Target
entity not available");
EntityInternal targetEntity = (EntityInternal)
targetEntityMaybe.get();
-ConfigKey key = targetEntity.getEntityType().getConfigKey(keyName);
-Maybe result = targetEntity.config().getNonBlocking(key != null ?
key : ConfigKeys.newConfigKey(Object.class, keyName));
+ConfigKey key = (ConfigKey)
targetEntity.getEntityType().getConfigKey(keyName);
+Maybe result = targetEntity.config().getNonBlocking(key !=
null ? key : ConfigKeys.newConfigKey(Object.class, keyName));
return Maybe.cast(result);
}
@@ -501,7 +501,7 @@ public class DslComponent extends
BrooklynDslDeferredSupplier {
@Override
public Object call() throws Exception {
Entity targetEntity = component.get();
-ConfigKey key =
targetEntity.getEntityType().getConfigKey(keyName);
+ConfigKey key = (ConfigKey)
targetEntity.getEntityType().getConfigKey(keyName);
return targetEntity.getConfig(key != null ? key :
ConfigKeys.newConfigKey(Object.class, keyName));
}})
.build();
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f6911c7..f2608ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,7 +78,7 @@
6.0.0
-1.7
+1.8
UTF-8
UTF-8
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f0f64f2b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
--
diff --git
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
index 00cb545..4638b43 100644
---
a/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
+++
b/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java
@@ -70,11 +70,11 @@ public class EnumTypeCoercions {
}
@SuppressWarnings({ "unchecked", "rawtypes" })
-public static Maybe tryCoerceUntyped(String input, Class
targetType) {
+public static Maybe tryCoerceUntyped(String input, Class targetType) {
if (input==null) return null;
if (targetType==null) return Maybe.absent("Null enum type");
if (!targetType.isEnum()) return Maybe.absent("Type '"+targetType+"'
is not an enum");
-return tryCoerce(input, (Class)targetType);
+return tryCoerce(input, targetType);
}
public static > Maybe tryCoerce(String input,
Class targetType) {
[3/4] brooklyn-server git commit: Java 7
Java 7 - restore java.version to 1.7 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7ec5869c Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7ec5869c Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7ec5869c Branch: refs/heads/master Commit: 7ec5869c33bcbf69f23e42589ec004d9f78dabed Parents: f0f64f2 Author: Guglielmo Nigri Authored: Wed Dec 14 12:17:29 2016 +0100 Committer: Guglielmo Nigri Committed: Wed Dec 14 12:17:29 2016 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7ec5869c/pom.xml -- diff --git a/pom.xml b/pom.xml index f2608ea..f6911c7 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 6.0.0 -1.8 +1.7 UTF-8 UTF-8
[4/4] brooklyn-server git commit: This closes #488
This closes #488 Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/55ec074f Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/55ec074f Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/55ec074f Branch: refs/heads/master Commit: 55ec074f4932a50c932f985c848a9be6beb8e30e Parents: 68a07aa 7ec5869 Author: Duncan Godwin Authored: Mon Feb 6 10:36:03 2017 + Committer: Duncan Godwin Committed: Mon Feb 6 10:36:03 2017 + -- .../brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java | 6 +++--- .../core/config/MapListAndOtherStructuredConfigKeyTest.java| 6 +++--- .../brooklyn/util/javalang/coerce/EnumTypeCoercions.java | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/camp/camp-brooklyn/src/main/java/org/apache/brooklyn/camp/brooklyn/spi/dsl/methods/DslComponent.java -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/core/src/test/java/org/apache/brooklyn/core/config/MapListAndOtherStructuredConfigKeyTest.java -- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/55ec074f/utils/common/src/main/java/org/apache/brooklyn/util/javalang/coerce/EnumTypeCoercions.java --
