[hornetq-commits] JBoss hornetq SVN: r10648 - in trunk/hornetq-core/src/main/java/org/hornetq/core: remoting/impl/netty and 1 other directories.

Author: borges Date: 2011-05-12 11:53:41 -0400 (Thu, 12 May 2011) New Revision: 10648 Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/FileConfiguration.java trunk/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java trunk/hornetq-core/src/main/java/org/hornetq/core/version/impl/VersionImpl.java Log: Fix warnings Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-05-12 15:52:54 UTC (rev 10647) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/ConfigurationImpl.java 2011-05-12 15:53:41 UTC (rev 10648) @@ -157,7 +157,7 @@ public static final int DEFAULT_ID_CACHE_SIZE = 2000; public static final boolean DEFAULT_PERSIST_ID_CACHE = true; - + public static final boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true; public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false; @@ -185,7 +185,7 @@ public static final String DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME = JULLogDelegateFactory.class.getCanonicalName(); // Attributes ----------------------------------------------------------------------------- - + protected String name = "ConfigurationImpl::" + System.identityHashCode(this); protected boolean clustered = ConfigurationImpl.DEFAULT_CLUSTERED; @@ -231,7 +231,7 @@ protected String logDelegateFactoryClassName = ConfigurationImpl.DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME; protected List<String> interceptorClassNames = new ArrayList<String>(); - + protected Map<String, TransportConfiguration> connectorConfigs = new HashMap<String, TransportConfiguration>(); protected Set<TransportConfiguration> acceptorConfigs = new HashSet<TransportConfiguration>(); @@ -341,56 +341,67 @@ // Public ------------------------------------------------------------------------- + @Override public boolean isClustered() { return clustered; } + @Override public void setClustered(final boolean clustered) { this.clustered = clustered; } + @Override public boolean isAllowAutoFailBack() { return allowAutoFailBack; } + @Override public void setAllowAutoFailBack(boolean allowAutoFailBack) { this.allowAutoFailBack = allowAutoFailBack; } + @Override public boolean isBackup() { return backup; } + @Override public boolean isFileDeploymentEnabled() { return fileDeploymentEnabled; } + @Override public void setFileDeploymentEnabled(final boolean enable) { fileDeploymentEnabled = enable; } + @Override public boolean isPersistenceEnabled() { return persistenceEnabled; } + @Override public void setPersistenceEnabled(final boolean enable) { persistenceEnabled = enable; } + @Override public long getFileDeployerScanPeriod() { return fileDeploymentScanPeriod; } + @Override public void setFileDeployerScanPeriod(final long period) { fileDeploymentScanPeriod = period; @@ -399,91 +410,109 @@ /** * @return the persistDeliveryCountBeforeDelivery */ + @Override public boolean isPersistDeliveryCountBeforeDelivery() { return persistDeliveryCountBeforeDelivery; } + @Override public void setPersistDeliveryCountBeforeDelivery(final boolean persistDeliveryCountBeforeDelivery) { this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery; } + @Override public void setBackup(final boolean backup) { this.backup = backup; } + @Override public boolean isSharedStore() { return sharedStore; } + @Override public void setSharedStore(final boolean sharedStore) { this.sharedStore = sharedStore; } + @Override public int getScheduledThreadPoolMaxSize() { return scheduledThreadPoolMaxSize; } + @Override public void setScheduledThreadPoolMaxSize(final int maxSize) { scheduledThreadPoolMaxSize = maxSize; } + @Override public int getThreadPoolMaxSize() { return threadPoolMaxSize; } + @Override public void setThreadPoolMaxSize(final int maxSize) { threadPoolMaxSize = maxSize; } + @Override public long getSecurityInvalidationInterval() { return securityInvalidationInterval; } + @Override public void setSecurityInvalidationInterval(final long interval) { securityInvalidationInterval = interval; } + @Override public long getConnectionTTLOverride() { return connectionTTLOverride; } + @Override public void setConnectionTTLOverride(final long ttl) { connectionTTLOverride = ttl; } + @Override public boolean isAsyncConnectionExecutionEnabled() { return asyncConnectionExecutionEnabled; } + @Override public void setEnabledAsyncConnectionExecution(final boolean enabled) { asyncConnectionExecutionEnabled = enabled; } + @Override public List<String> getInterceptorClassNames() { return interceptorClassNames; } + @Override public void setInterceptorClassNames(final List<String> interceptors) { interceptorClassNames = interceptors; } + @Override public Set<TransportConfiguration> getAcceptorConfigurations() { return acceptorConfigs; @@ -499,26 +528,31 @@ return connectorConfigs; } + @Override public void setConnectorConfigurations(final Map<String, TransportConfiguration> infos) { connectorConfigs = infos; } + @Override public String getLiveConnectorName() { return liveConnectorName; } + @Override public void setLiveConnectorName(final String liveConnectorName) { this.liveConnectorName = liveConnectorName; } - + + @Override public GroupingHandlerConfiguration getGroupingHandlerConfiguration() { return groupingHandlerConfiguration; } + @Override public void setGroupingHandlerConfiguration(final GroupingHandlerConfiguration groupingHandlerConfiguration) { this.groupingHandlerConfiguration = groupingHandlerConfiguration; Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/FileConfiguration.java 2011-05-12 15:52:54 UTC (rev 10647) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/config/impl/FileConfiguration.java 2011-05-12 15:53:41 UTC (rev 10648) @@ -23,8 +23,7 @@ import org.w3c.dom.Element; /** - * ConfigurationImpl - * This class allows the Configuration class to be configured via a config file. + * A {@code FileConfiguration} reads configuration values from a file. * * @author <a href=&quot;ataylor(a)redhat.com&quot;&gt;Andy Taylor</a> * @author <a href=&quot;tim.fox(a)jboss.com&quot;&gt;Tim Fox</a> @@ -39,8 +38,7 @@ private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml"; - // For a bridge confirmations must be activated or send acknowledgements won't return - + // For a bridge confirmations must be activated or sent acknowledgments won't return public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; // Static -------------------------------------------------------------------------- @@ -59,25 +57,25 @@ { return; } - - + + URL url = getClass().getClassLoader().getResource(configurationUrl); - + if (url == null) { // The URL is outside of the classloader. Trying a pure url now url = new URL(configurationUrl); } - + FileConfiguration.log.debug("Loading server configuration from " + url); Reader reader = new InputStreamReader(url.openStream()); String xml = org.hornetq.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); Element e = org.hornetq.utils.XMLUtil.stringToElement(xml); - + FileConfigurationParser parser = new FileConfigurationParser(); - + // https://jira.jboss.org/browse/HORNETQ-478 - We only want to validate AIO when // starting the server // and we don't want to do it when deploying hornetq-queues.xml which uses the same parser and XML format Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2011-05-12 15:52:54 UTC (rev 10647) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/remoting/impl/netty/NettyAcceptor.java 2011-05-12 15:53:41 UTC (rev 10648) @@ -267,6 +267,7 @@ configuration); } + @Override public synchronized void start() throws Exception { if (channelFactory != null) @@ -329,6 +330,7 @@ ChannelPipelineFactory factory = new ChannelPipelineFactory() { + @Override public ChannelPipeline getPipeline() throws Exception { Map<String, ChannelHandler> handlers = new LinkedHashMap<String, ChannelHandler>(); @@ -347,7 +349,7 @@ if (httpEnabled) { handlers.put("http-decoder", new HttpRequestDecoder()); - + handlers.put("http-aggregator", new HttpChunkAggregator(Integer.MAX_VALUE)); handlers.put("http-encoder", new HttpResponseEncoder()); @@ -484,6 +486,7 @@ } } + @Override public synchronized void stop() { if (channelFactory == null) @@ -559,11 +562,13 @@ paused = false; } + @Override public boolean isStarted() { return channelFactory != null; } + @Override public void pause() { if (paused) @@ -606,6 +611,7 @@ paused = true; } + @Override public void setNotificationService(final NotificationService notificationService) { this.notificationService = notificationService; @@ -632,6 +638,7 @@ { sslHandler.handshake().addListener(new ChannelFutureListener() { + @Override public void operationComplete(final ChannelFuture future) throws Exception { if (future.isSuccess()) @@ -654,6 +661,7 @@ private class Listener implements ConnectionLifeCycleListener { + @Override public void connectionCreated(final Connection connection, final ProtocolType protocol) { if (connections.putIfAbsent(connection.getID(), (NettyConnection)connection) != null) @@ -664,6 +672,7 @@ listener.connectionCreated(connection, NettyAcceptor.this.protocol); } + @Override public void connectionDestroyed(final Object connectionID) { if (connections.remove(connectionID) != null) @@ -672,6 +681,7 @@ } } + @Override public void connectionException(final Object connectionID, final HornetQException me) { // Execute on different thread to avoid deadlocks @@ -686,21 +696,23 @@ } + @Override public void connectionReadyForWrites(final Object connectionID, boolean ready) { NettyConnection conn = connections.get(connectionID); - + if (conn != null) { conn.fireReady(ready); - } - } + } + } } private class BatchFlusher implements Runnable { private boolean cancelled; + @Override public synchronized void run() { if (!cancelled) Modified: trunk/hornetq-core/src/main/java/org/hornetq/core/version/impl/VersionImpl.java =================================================================== --- trunk/hornetq-core/src/main/java/org/hornetq/core/version/impl/VersionImpl.java 2011-05-12 15:52:54 UTC (rev 10647) +++ trunk/hornetq-core/src/main/java/org/hornetq/core/version/impl/VersionImpl.java 2011-05-12 15:53:41 UTC (rev 10648) @@ -46,7 +46,7 @@ private final int incrementingVersion; private final String versionSuffix; - + private final String nettyVersion; private final int[] compatibleVersionList; @@ -75,12 +75,13 @@ this.versionSuffix = versionSuffix; this.nettyVersion = nettyVersion; - + this.compatibleVersionList = compatibleVersionList; } // Version implementation ------------------------------------------ + @Override public String getFullVersion() { return majorVersion + "." + @@ -96,41 +97,49 @@ ")"; } + @Override public String getVersionName() { return versionName; } + @Override public int getMajorVersion() { return majorVersion; } + @Override public int getMinorVersion() { return minorVersion; } + @Override public int getMicroVersion() { return microVersion; } + @Override public String getVersionSuffix() { return versionSuffix; } + @Override public int getIncrementingVersion() { return incrementingVersion; } + @Override public String getNettyVersion() { return nettyVersion; } + @Override public int[] getCompatibleVersionList() { return compatibleVersionList; @@ -145,7 +154,7 @@ { return true; } - if (other instanceof Version == false) + if (!(other instanceof Version)) { return false; }