Skip to content

Commit

Permalink
AS7-2094 switch from BIG_DECIMAL to INT for thread count properties
Browse files Browse the repository at this point in the history
  • Loading branch information
@bstansberry
Alexey Loubyansky authored and bstansberry committed Oct 14, 2011
1 parent 5828972 commit f04e2d8
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 26 deletions.
2 changes: 0 additions & 2 deletions threads/src/main/java/org/jboss/as/threads/PoolAttributeDefinitions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@

import org.jboss.as.controller.AttributeDefinition;
import org.jboss.as.controller.ListAttributeDefinition;
import org.jboss.as.controller.OperationFailedException;
import org.jboss.as.controller.SimpleAttributeDefinition;
import org.jboss.as.controller.client.helpers.MeasurementUnit;
import org.jboss.as.controller.descriptions.ModelDescriptionConstants;
import org.jboss.as.controller.descriptions.ResourceDescriptionResolver;
import org.jboss.as.controller.operations.validation.AbstractParameterValidator;
import org.jboss.as.controller.operations.validation.IntRangeValidator;
import org.jboss.as.controller.operations.validation.ModelTypeValidator;
import org.jboss.dmr.ModelNode;
Expand Down
24 changes: 12 additions & 12 deletions threads/src/main/java/org/jboss/as/threads/ThreadsSubsystemProviders.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,23 +173,23 @@ public ModelNode getModelDescription(final Locale locale) {
operation.get(ATTRIBUTES, CORE_THREADS, REQUIRED).set(false);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.bounded.corethreads.count"));
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, COUNT, REQUIRED).set(true);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.bounded.corethreads.percpu"));
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
operation.get(ATTRIBUTES, CORE_THREADS, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

operation.get(ATTRIBUTES, QUEUE_LENGTH, DESCRIPTION).set(bundle.getString("threadpool.bounded.queuelength"));
operation.get(ATTRIBUTES, QUEUE_LENGTH, TYPE).set(ModelType.OBJECT);
operation.get(ATTRIBUTES, QUEUE_LENGTH, REQUIRED).set(true);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.bounded.queuelength.count"));
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, COUNT, REQUIRED).set(true);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.bounded.queuelength.percpu"));
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
operation.get(ATTRIBUTES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

return operation;
Expand Down Expand Up @@ -257,11 +257,11 @@ private static ModelNode getCommonThreadPool(final ResourceBundle bundle, final
node.get(ATTRIBUTES, MAX_THREADS, REQUIRED).set(true);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.common.maxthreads.count"));
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, COUNT, REQUIRED).set(true);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.common.maxthreads.percpu"));
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
node.get(ATTRIBUTES, MAX_THREADS, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

node.get(ATTRIBUTES, KEEPALIVE_TIME, DESCRIPTION).set(bundle.getString("threadpool.common.keepalive"));
Expand Down Expand Up @@ -367,11 +367,11 @@ public ModelNode getModelDescription(final Locale locale) {
operation.get(REQUEST_PROPERTIES, CORE_THREADS, REQUIRED).set(false);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.bounded.corethreads.count"));
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, COUNT, REQUIRED).set(true);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.bounded.corethreads.percpu"));
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, CORE_THREADS, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, DESCRIPTION)
Expand All @@ -380,11 +380,11 @@ public ModelNode getModelDescription(final Locale locale) {
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, REQUIRED).set(true);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.bounded.queuelength.count"));
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, COUNT, REQUIRED).set(true);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.bounded.queuelength.percpu"));
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, QUEUE_LENGTH, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

return operation;
Expand Down Expand Up @@ -450,11 +450,11 @@ static ModelNode getCommonAddThreadPool(final ResourceBundle bundle, final Strin
operation.get(REQUEST_PROPERTIES, MAX_THREADS, REQUIRED).set(true);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, COUNT, DESCRIPTION).set(
bundle.getString("threadpool.common.maxthreads.count"));
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, COUNT, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, COUNT, REQUIRED).set(true);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, PER_CPU, DESCRIPTION).set(
bundle.getString("threadpool.common.maxthreads.percpu"));
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.BIG_DECIMAL);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, PER_CPU, TYPE).set(ModelType.INT);
operation.get(REQUEST_PROPERTIES, MAX_THREADS, VALUE_TYPE, PER_CPU, REQUIRED).set(true);

operation.get(REQUEST_PROPERTIES, KEEPALIVE_TIME, DESCRIPTION).set(bundle.getString("threadpool.common.keepalive"));
Expand Down
24 changes: 12 additions & 12 deletions threads/src/test/java/org/jboss/as/threads/ThreadsSubsystemTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -228,26 +228,26 @@ public void testGetModelDescription() throws Exception {
assertEquals(ModelType.OBJECT, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(TYPE)
.asType());
assertEquals(
ModelType.BIG_DECIMAL,
ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.OBJECT, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(CORE_THREADS).require(TYPE)
.asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(CORE_THREADS).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(CORE_THREADS).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.OBJECT, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(QUEUE_LENGTH).require(TYPE)
.asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(QUEUE_LENGTH).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(QUEUE_LENGTH).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.OBJECT, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(KEEPALIVE_TIME).require(TYPE)
Expand All @@ -269,10 +269,10 @@ public void testGetModelDescription() throws Exception {
.asType());
assertEquals(ModelType.OBJECT, queueLessThreadPoolDesc.require(ATTRIBUTES).require(PROPERTIES).require(TYPE).asType());
assertEquals(
ModelType.BIG_DECIMAL,
ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.LONG, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(KEEPALIVE_TIME).require(VALUE_TYPE)
Expand All @@ -290,10 +290,10 @@ public void testGetModelDescription() throws Exception {
.asType());
assertEquals(ModelType.OBJECT, scheduledThreadPoolDesc.require(ATTRIBUTES).require(PROPERTIES).require(TYPE).asType());
assertEquals(
ModelType.BIG_DECIMAL,
ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.LONG, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(KEEPALIVE_TIME).require(VALUE_TYPE)
Expand All @@ -309,10 +309,10 @@ public void testGetModelDescription() throws Exception {
.asType());
assertEquals(ModelType.OBJECT, unboundedThreadPoolDesc.require(ATTRIBUTES).require(PROPERTIES).require(TYPE).asType());
assertEquals(
ModelType.BIG_DECIMAL,
ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(COUNT)
.require(TYPE).asType());
assertEquals(ModelType.BIG_DECIMAL,
assertEquals(ModelType.INT,
boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(MAX_THREADS).require(VALUE_TYPE).require(PER_CPU)
.require(TYPE).asType());
assertEquals(ModelType.LONG, boundedQueueThreadPoolDesc.require(ATTRIBUTES).require(KEEPALIVE_TIME).require(VALUE_TYPE)
Expand Down

0 comments on commit f04e2d8

Please sign in to comment.