[jboss-cvs] JBoss Messaging SVN: r5911 - in trunk: src/main/org/jboss/messaging/core/settings/impl and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 20 07:12:32 EST 2009
Author: timfox
Date: 2009-02-20 07:12:32 -0500 (Fri, 20 Feb 2009)
New Revision: 5911
Modified:
trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
trunk/src/main/org/jboss/messaging/core/settings/impl/AddressSettings.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java
Log:
tweaks to AddressSettings plus small fix to ManagementServiceImplTest
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-02-20 10:43:04 UTC (rev 5910)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/ManagementServiceImpl.java 2009-02-20 12:12:32 UTC (rev 5911)
@@ -135,7 +135,7 @@
private final Set<NotificationListener> listeners = new ConcurrentHashSet<NotificationListener>();
- private ReplicationOperationInvokerImpl replicationInvoker;
+ private ReplicationOperationInvoker replicationInvoker;
// Constructor ----------------------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/settings/impl/AddressSettings.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/settings/impl/AddressSettings.java 2009-02-20 10:43:04 UTC (rev 5910)
+++ trunk/src/main/org/jboss/messaging/core/settings/impl/AddressSettings.java 2009-02-20 12:12:32 UTC (rev 5911)
@@ -43,22 +43,22 @@
*/
public static final Class<?> DEFAULT_DISTRIBUTION_POLICY_CLASS = new RoundRobinDistributor().getClass();
- public static final Integer DEFAULT_MAX_SIZE_BYTES = -1;
+ public static final int DEFAULT_MAX_SIZE_BYTES = -1;
- public static final Boolean DEFAULT_DROP_MESSAGES_WHEN_FULL = Boolean.FALSE;
-
- public static final Integer DEFAULT_PAGE_SIZE = 10 * 1024 * 1024;
+ public static final boolean DEFAULT_DROP_MESSAGES_WHEN_FULL = false;
- public static final Integer DEFAULT_MAX_DELIVERY_ATTEMPTS = 10;
+ public static final int DEFAULT_PAGE_SIZE = 10 * 1024 * 1024;
- public static final Integer DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT = 0;
+ public static final int DEFAULT_MAX_DELIVERY_ATTEMPTS = 10;
- public static final Long DEFAULT_REDELIVER_DELAY = 0L;
+ public static final int DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT = 0;
- public static final Boolean DEFAULT_SOLOQUEUE = false;
-
- public static final Long DEFAULT_REDISTRIBUTION_DELAY = -1L;
+ public static final long DEFAULT_REDELIVER_DELAY = 0L;
+ public static final boolean DEFAULT_SOLO_QUEUE = false;
+
+ public static final long DEFAULT_REDISTRIBUTION_DELAY = -1;
+
private Integer maxSizeBytes = null;
private Integer pageSizeBytes = null;
@@ -78,76 +78,76 @@
private SimpleString expiryAddress = null;
private Boolean soloQueue = null;
-
+
private Long redistributionDelay = null;
- public Boolean isSoloQueue()
+ public boolean isSoloQueue()
{
- return soloQueue != null?soloQueue:DEFAULT_SOLOQUEUE;
+ return soloQueue != null ? soloQueue : DEFAULT_SOLO_QUEUE;
}
- public void setSoloQueue(Boolean soloQueue)
+ public void setSoloQueue(final boolean soloQueue)
{
this.soloQueue = soloQueue;
}
- public Integer getPageSizeBytes()
+ public int getPageSizeBytes()
{
- return pageSizeBytes != null ? this.pageSizeBytes : DEFAULT_PAGE_SIZE;
+ return pageSizeBytes != null ? pageSizeBytes : DEFAULT_PAGE_SIZE;
}
- public Boolean isDropMessagesWhenFull()
+ public boolean isDropMessagesWhenFull()
{
- return dropMessagesWhenFull != null ? this.dropMessagesWhenFull : DEFAULT_DROP_MESSAGES_WHEN_FULL;
+ return dropMessagesWhenFull != null ? dropMessagesWhenFull : DEFAULT_DROP_MESSAGES_WHEN_FULL;
}
- public void setDropMessagesWhenFull(Boolean value)
+ public void setDropMessagesWhenFull(final boolean value)
{
- this.dropMessagesWhenFull = value;
+ dropMessagesWhenFull = value;
}
- public void setPageSizeBytes(Integer pageSize)
+ public void setPageSizeBytes(final int pageSize)
{
- this.pageSizeBytes = pageSize;
+ pageSizeBytes = pageSize;
}
- public Integer getMaxSizeBytes()
+ public int getMaxSizeBytes()
{
return maxSizeBytes != null ? maxSizeBytes : DEFAULT_MAX_SIZE_BYTES;
}
- public void setMaxSizeBytes(Integer maxSizeBytes)
+ public void setMaxSizeBytes(final int maxSizeBytes)
{
this.maxSizeBytes = maxSizeBytes;
}
- public Integer getMaxDeliveryAttempts()
+ public int getMaxDeliveryAttempts()
{
return maxDeliveryAttempts != null ? maxDeliveryAttempts : DEFAULT_MAX_DELIVERY_ATTEMPTS;
}
- public void setMaxDeliveryAttempts(Integer maxDeliveryAttempts)
+ public void setMaxDeliveryAttempts(final int maxDeliveryAttempts)
{
this.maxDeliveryAttempts = maxDeliveryAttempts;
}
- public Integer getMessageCounterHistoryDayLimit()
+ public int getMessageCounterHistoryDayLimit()
{
return messageCounterHistoryDayLimit != null ? messageCounterHistoryDayLimit
: DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT;
}
- public void setMessageCounterHistoryDayLimit(Integer messageCounterHistoryDayLimit)
+ public void setMessageCounterHistoryDayLimit(final int messageCounterHistoryDayLimit)
{
this.messageCounterHistoryDayLimit = messageCounterHistoryDayLimit;
}
- public Long getRedeliveryDelay()
+ public long getRedeliveryDelay()
{
return redeliveryDelay != null ? redeliveryDelay : DEFAULT_REDELIVER_DELAY;
}
- public void setRedeliveryDelay(Long redeliveryDelay)
+ public void setRedeliveryDelay(final long redeliveryDelay)
{
this.redeliveryDelay = redeliveryDelay;
}
@@ -157,7 +157,7 @@
return distributionPolicyClass;
}
- public void setDistributionPolicyClass(String distributionPolicyClass)
+ public void setDistributionPolicyClass(final String distributionPolicyClass)
{
this.distributionPolicyClass = distributionPolicyClass;
}
@@ -167,7 +167,7 @@
return deadLetterAddress;
}
- public void setDeadLetterAddress(SimpleString deadLetterAddress)
+ public void setDeadLetterAddress(final SimpleString deadLetterAddress)
{
this.deadLetterAddress = deadLetterAddress;
}
@@ -177,7 +177,7 @@
return expiryAddress;
}
- public void setExpiryAddress(SimpleString expiryAddress)
+ public void setExpiryAddress(final SimpleString expiryAddress)
{
this.expiryAddress = expiryAddress;
}
@@ -200,13 +200,13 @@
throw new IllegalArgumentException("Error instantiating distribution policy '" + e + " '");
}
}
-
- public Long getRedistributionDelay()
+
+ public long getRedistributionDelay()
{
return redistributionDelay != null ? redistributionDelay : DEFAULT_REDISTRIBUTION_DELAY;
}
-
- public void setRedistributionDelay(final Long redistributionDelay)
+
+ public void setRedistributionDelay(final long redistributionDelay)
{
this.redistributionDelay = redistributionDelay;
}
@@ -215,7 +215,7 @@
* merge 2 objects in to 1
* @param merged
*/
- public void merge(AddressSettings merged)
+ public void merge(final AddressSettings merged)
{
if (maxDeliveryAttempts == null)
{
@@ -255,7 +255,7 @@
}
if (redistributionDelay == null)
{
- this.redistributionDelay = merged.redistributionDelay;
+ redistributionDelay = merged.redistributionDelay;
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java 2009-02-20 10:43:04 UTC (rev 5910)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/settings/impl/AddressSettingsTest.java 2009-02-20 12:12:32 UTC (rev 5911)
@@ -66,11 +66,11 @@
assertEquals(addressSettings.getDistributionPolicyClass(), null);
assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
assertEquals(addressSettings.getExpiryAddress(), exp);
- assertEquals(addressSettings.getMaxDeliveryAttempts(), Integer.valueOf(1000));
- assertEquals(addressSettings.getMaxSizeBytes(), Integer.valueOf(1001));
- assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(1002));
- assertEquals(addressSettings.getRedeliveryDelay(), Long.valueOf(1003));
- assertEquals(addressSettings.getPageSizeBytes(), (Integer)1004);
+ assertEquals(addressSettings.getMaxDeliveryAttempts(), 1000);
+ assertEquals(addressSettings.getMaxSizeBytes(), 1001);
+ assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 1002);
+ assertEquals(addressSettings.getRedeliveryDelay(), 1003);
+ assertEquals(addressSettings.getPageSizeBytes(), 1004);
assertTrue(addressSettings.isDropMessagesWhenFull());
}
@@ -98,10 +98,10 @@
assertEquals(addressSettings.getDistributionPolicyClass(), null);
assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
assertEquals(addressSettings.getExpiryAddress(), exp);
- assertEquals(addressSettings.getMaxDeliveryAttempts(), Integer.valueOf(1000));
- assertEquals(addressSettings.getMaxSizeBytes(), Integer.valueOf(1001));
- assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(1002));
- assertEquals(addressSettings.getRedeliveryDelay(), Long.valueOf(2003));
+ assertEquals(addressSettings.getMaxDeliveryAttempts(), 1000);
+ assertEquals(addressSettings.getMaxSizeBytes(), 1001);
+ assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 1002);
+ assertEquals(addressSettings.getRedeliveryDelay(), 2003);
}
public void testMultipleMergeAll()
@@ -131,9 +131,9 @@
assertEquals(addressSettings.getDistributionPolicyClass(), null);
assertEquals(addressSettings.getDeadLetterAddress(), DLQ);
assertEquals(addressSettings.getExpiryAddress(), exp);
- assertEquals(addressSettings.getMaxDeliveryAttempts(), Integer.valueOf(2000));
- assertEquals(addressSettings.getMaxSizeBytes(), Integer.valueOf(1001));
- assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), Integer.valueOf(2002));
- assertEquals(addressSettings.getRedeliveryDelay(), Long.valueOf(1003));
+ assertEquals(addressSettings.getMaxDeliveryAttempts(), 2000);
+ assertEquals(addressSettings.getMaxSizeBytes(), 1001);
+ assertEquals(addressSettings.getMessageCounterHistoryDayLimit(), 2002);
+ assertEquals(addressSettings.getRedeliveryDelay(),1003);
}
}
More information about the jboss-cvs-commits
mailing list