Jeroen Hoffman pushed to branch release/5.0 at cms-community /
hippo-site-toolkit
Commits:
2208d4ff by Jeroen Hoffman at 2017-11-17T11:46:13+01:00
HSTTWO-4167 (cherry pick merge fix) remove unused variable, add final, reuse
'titleKey' variable
- - - - -
1 changed file:
-
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
Changes:
=====================================
client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
=====================================
---
a/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
+++
b/client-modules/page-composer/src/main/java/org/hippoecm/hst/pagecomposer/jaxrs/model/ParametersInfoProcessor.java
@@ -273,9 +273,8 @@ public class ParametersInfoProcessor {
final Multimap<String, ContainerItemComponentPropertyRepresentation>
fieldGroupProperties = LinkedHashMultimap.create();
for (final Class<?> interfaceClass :
getBreadthFirstInterfaceHierarchy(classType)) {
- Multimap<String, ContainerItemComponentPropertyRepresentation>
interfaceClassFieldGroupProperties = LinkedHashMultimap.create();
final FieldGroupList fieldGroupList =
interfaceClass.getAnnotation(FieldGroupList.class);
- Set<String> uniquePropertiesForInterfaceClass = new HashSet<>();
+ final Set<String> uniquePropertiesForInterfaceClass = new
HashSet<>();
if (fieldGroupList != null) {
final FieldGroup[] fieldGroups = fieldGroupList.value();
if (fieldGroups != null && fieldGroups.length > 0) {
@@ -290,10 +289,10 @@ public class ParametersInfoProcessor {
final ContainerItemComponentPropertyRepresentation
property = propertyMap.get(propertyName);
if
(!uniquePropertiesForInterfaceClass.add(propertyName)) {
log.warn("Ignoring duplicate parameter '{}' in
field group '{}' of parameters info interface '{}'",
- propertyName, fieldGroup.titleKey(),
classType.getCanonicalName());
+ propertyName, titleKey,
classType.getCanonicalName());
} else if (property == null) {
- log.warn("Ignoring unknown parameter '{}' in
parameters info interface '{}'",
- propertyName,
classType.getCanonicalName());
+ log.warn("Ignoring unknown parameter '{}' in
field group '{}' of parameters info interface '{}'",
+ propertyName, titleKey,
classType.getCanonicalName());
} else if
(fieldGroupProperties.containsValue(property)) {
// valid if FieldGroup is (re)defined in
inherited Info Class
log.debug("Parameter '{}' in field group '{}'
of parameters info interface '{}' was already added to list.",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2208d4ffa2039bf8bd56065c11023960bfd8537d
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2208d4ffa2039bf8bd56065c11023960bfd8537d
You're receiving this email because of your account on code.onehippo.org.
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
