You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/03/14 18:04:44 UTC
svn commit: r1734964 - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/
broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/
Author: rgodfrey
Date: Mon Mar 14 17:04:44 2016
New Revision: 1734964
URL: http://svn.apache.org/viewvc?rev=1734964&view=rev
Log:
QPID-7066 : Address review comments by [~lorenz.quack]
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableAttribute.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Mon Mar 14 17:04:44 2016
@@ -474,7 +474,7 @@ public abstract class AbstractConfigured
valuesToCheck = Collections.emptySet();
}
- Pattern pattern = Pattern.compile(attribute.vaidValuePattern());
+ Pattern pattern = Pattern.compile(attribute.validValuePattern());
for (String value : valuesToCheck)
{
if(!pattern.matcher(value).matches())
@@ -1124,7 +1124,7 @@ public abstract class AbstractConfigured
+ autoAttr.validValues());
}
}
- else if(!"".equals(autoAttr.vaidValuePattern()))
+ else if(!"".equals(autoAttr.validValuePattern()))
{
Object desiredValueOrDefault = autoAttr.getValue(this);
@@ -1135,7 +1135,7 @@ public abstract class AbstractConfigured
+ " named '" + getName() + "'"
+ " cannot have value '" + desiredValueOrDefault + "'"
+ ". Valid values pattern is: "
- + autoAttr.vaidValuePattern());
+ + autoAttr.validValuePattern());
}
}
if(autoAttr.isMandatory() && autoAttr.getValue(this) == null)
@@ -2559,7 +2559,7 @@ public abstract class AbstractConfigured
+ autoAttr.validValues());
}
}
- else if(!"".equals(autoAttr.vaidValuePattern()))
+ else if(!"".equals(autoAttr.validValuePattern()))
{
Object desiredValueOrDefault = autoAttr.getValue(proxyForValidation);
@@ -2570,7 +2570,7 @@ public abstract class AbstractConfigured
+ " named '" + getName() + "'"
+ " cannot have value '" + desiredValueOrDefault + "'"
+ ". Valid values pattern is: "
- + autoAttr.vaidValuePattern());
+ + autoAttr.validValuePattern());
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredAutomatedAttribute.java Mon Mar 14 17:04:44 2016
@@ -202,7 +202,7 @@ public class ConfiguredAutomatedAttribut
}
@Override
- public String vaidValuePattern()
+ public String validValuePattern()
{
return _annotation.validValuePattern();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableAttribute.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableAttribute.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableAttribute.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableAttribute.java Mon Mar 14 17:04:44 2016
@@ -32,7 +32,7 @@ public interface ConfiguredSettableAttri
Collection<String> validValues();
- String vaidValuePattern();
+ String validValuePattern();
boolean hasValidValues();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredSettableInjectedAttribute.java Mon Mar 14 17:04:44 2016
@@ -243,7 +243,7 @@ public class ConfiguredSettableInjectedA
}
@Override
- public String vaidValuePattern()
+ public String validValuePattern()
{
return _validValuePattern;
}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ApiDocsServlet.java Mon Mar 14 17:04:44 2016
@@ -402,7 +402,7 @@ public class ApiDocsServlet extends Abst
{
ConfiguredSettableAttribute<?,?> settableAttribute = (ConfiguredSettableAttribute<?,?>) attribute;
validValues = settableAttribute.hasValidValues() ? settableAttribute.validValues() : null;
- validValuePattern = settableAttribute.vaidValuePattern();
+ validValuePattern = settableAttribute.validValuePattern();
}
else
{
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java?rev=1734964&r1=1734963&r2=1734964&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MetaDataServlet.java Mon Mar 14 17:04:44 2016
@@ -193,9 +193,9 @@ public class MetaDataServlet extends Abs
}
attrDetails.put("validValues", convertedValues);
}
- else if(!"".equals(automatedAttribute.vaidValuePattern()))
+ else if(!"".equals(automatedAttribute.validValuePattern()))
{
- attrDetails.put("validValuesPattern", automatedAttribute.vaidValuePattern());
+ attrDetails.put("validValuesPattern", automatedAttribute.validValuePattern());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org