T getTargetObject(Object candidate) {
try {
if (AopUtils.isAopProxy(candidate) && candidate instanceof Advised) {
@@ -65,4 +67,5 @@ public final class ConfigurationBeanUtils {
}
return (T) candidate;
}
-}
\ No newline at end of file
+
+}
diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/support/KebabCasePropertyBeanIntrospector.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/support/KebabCasePropertyBeanIntrospector.java
index ca9207c..fba502e 100644
--- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/support/KebabCasePropertyBeanIntrospector.java
+++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/support/KebabCasePropertyBeanIntrospector.java
@@ -15,49 +15,40 @@
*/
package org.springframework.cloud.appbroker.extensions.support;
-import org.apache.commons.beanutils.BeanIntrospector;
-import org.apache.commons.beanutils.DefaultBeanIntrospector;
-import org.apache.commons.beanutils.IntrospectionContext;
-import reactor.util.Logger;
-import reactor.util.Loggers;
-
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.util.Locale;
+import org.apache.commons.beanutils.BeanIntrospector;
+import org.apache.commons.beanutils.DefaultBeanIntrospector;
+import org.apache.commons.beanutils.IntrospectionContext;
+import reactor.util.Logger;
+import reactor.util.Loggers;
+
/**
+ * An implementation of the {@link BeanIntrospector} interface that provides property descriptors following the
+ * kebab-case convention.
*
- * An implementation of the {@link BeanIntrospector} interface that provides property descriptors
- * following the kebab-case convention.
- *
- *
- * This implementation is intended to collaborate with a {@link DefaultBeanIntrospector} object.
- * Best results are achieved by adding this instance as custom {@link BeanIntrospector} after the
- * {@link DefaultBeanIntrospector} object.
+ * This implementation is intended to collaborate with a {@link DefaultBeanIntrospector} object. Best results are
+ * achieved by adding this instance as custom {@link BeanIntrospector} after the {@link DefaultBeanIntrospector}
+ * object.
*/
public class KebabCasePropertyBeanIntrospector implements BeanIntrospector {
+ private static final Logger LOG = Loggers.getLogger(KebabCasePropertyBeanIntrospector.class);
+
private static final String WRITE_METHOD_PREFIX = "set";
- private final Logger log = Loggers.getLogger(getClass());
-
/**
- * Creates a new instance of KebabCaseBeanIntrospector and
- * sets the default prefix for write methods.
- */
- KebabCasePropertyBeanIntrospector() {
- }
-
- /**
- * Performs introspection. This method scans the current class's methods for
- * property write methods add adds a property descriptor using the kebab-case
- * naming convention to match each property descriptor that uses the camel-case
- * Java Bean convention.
+ * Performs introspection. This method scans the current class's methods for property write methods add adds a
+ * property descriptor using the kebab-case naming convention to match each property descriptor that uses the
+ * camel-case Java Bean convention.
*
* @param context the introspection context
*/
+ @Override
public void introspect(final IntrospectionContext context) {
for (final Method m : context.getTargetClass().getMethods()) {
if (m.getName().startsWith(WRITE_METHOD_PREFIX)) {
@@ -67,9 +58,12 @@ public class KebabCasePropertyBeanIntrospector implements BeanIntrospector {
if (pd != null) {
context.addPropertyDescriptor(createPropertyDescriptor(m));
}
- } catch (final IntrospectionException e) {
- log.error("Error when creating PropertyDescriptor for method '{}'. " +
+ }
+ catch (final IntrospectionException e) {
+ if (LOG.isErrorEnabled()) {
+ LOG.error("Error when creating PropertyDescriptor for method '{}'. " +
"This property will be ignored. {}", m, e);
+ }
}
}
}
@@ -96,16 +90,17 @@ public class KebabCasePropertyBeanIntrospector implements BeanIntrospector {
*/
private String kebabCasePropertyName(final Method m) {
final String methodName = camelCasePropertyName(m);
-
+
StringBuilder builder = new StringBuilder();
for (char c : methodName.toCharArray()) {
if (Character.isUpperCase(c)) {
builder.append('-').append(Character.toLowerCase(c));
- } else {
+ }
+ else {
builder.append(c);
}
}
-
+
return builder.toString();
}
@@ -120,4 +115,5 @@ public class KebabCasePropertyBeanIntrospector implements BeanIntrospector {
String propertyName = kebabCasePropertyName(m);
return new PropertyDescriptor(propertyName, null, m);
}
-}
\ No newline at end of file
+
+}
diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ArtifactDetails.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ArtifactDetails.java
index 9849b7b..4b99f44 100644
--- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ArtifactDetails.java
+++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ArtifactDetails.java
@@ -24,9 +24,10 @@ import org.springframework.util.CollectionUtils;
public class ArtifactDetails {
private final String name;
+
private final Map properties;
- ArtifactDetails(String name, Map properties) {
+ public ArtifactDetails(String name, Map properties) {
this.name = name;
this.properties = properties;
}
@@ -46,9 +47,10 @@ public class ArtifactDetails {
public static final class ArtifactDetailsBuilder {
private String name;
+
private final Map properties = new HashMap<>();
- ArtifactDetailsBuilder() {
+ private ArtifactDetailsBuilder() {
}
public ArtifactDetailsBuilder name(String name) {
diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ServiceInstanceGuidSuffix.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ServiceInstanceGuidSuffix.java
index a25d176..7dd4977 100644
--- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ServiceInstanceGuidSuffix.java
+++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/ServiceInstanceGuidSuffix.java
@@ -36,7 +36,7 @@ public class ServiceInstanceGuidSuffix extends TargetFactory properties, String name, String serviceInstanceId);
+
}
diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetFactory.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetFactory.java
index ec14640..6ca9f15 100644
--- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetFactory.java
+++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetFactory.java
@@ -20,18 +20,20 @@ import org.springframework.cloud.appbroker.extensions.AbstractExtensionFactory;
public abstract class TargetFactory extends AbstractExtensionFactory {
- TargetFactory() {
+ protected TargetFactory() {
super();
}
- TargetFactory(Class configClass) {
+ public TargetFactory(Class configClass) {
super(configClass);
}
@Override
public abstract Target create(C config);
+ @Override
public String getName() {
return getShortName(TargetFactory.class);
}
+
}
diff --git a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetService.java b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetService.java
index 32c03e5..f4fdc21 100644
--- a/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetService.java
+++ b/spring-cloud-app-broker-core/src/main/java/org/springframework/cloud/appbroker/extensions/targets/TargetService.java
@@ -37,8 +37,7 @@ public class TargetService {
}
public Mono> addToBackingApplications(List backingApplications,
- TargetSpec targetSpec,
- String serviceInstanceId) {
+ TargetSpec targetSpec, String serviceInstanceId) {
return Flux.fromIterable(backingApplications)
.flatMap(backingApplication -> {
if (targetSpec != null) {
@@ -59,8 +58,8 @@ public class TargetService {
}
public Mono