[jboss-remoting-commits] JBoss Remoting SVN: r5100 - in remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3: spi and 1 other directory.
jboss-remoting-commits at lists.jboss.org
jboss-remoting-commits at lists.jboss.org
Thu Apr 30 18:58:40 EDT 2009
Author: david.lloyd at jboss.com
Date: 2009-04-30 18:58:40 -0400 (Thu, 30 Apr 2009)
New Revision: 5100
Removed:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceSpecification.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractConnectionProviderContext.java
Modified:
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceLocationListener.java
remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceRegistration.java
Log:
Remove unused stuff, update javadocs
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceLocationListener.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceLocationListener.java 2009-04-30 22:50:24 UTC (rev 5099)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceLocationListener.java 2009-04-30 22:58:40 UTC (rev 5100)
@@ -32,33 +32,66 @@
public interface ServiceLocationListener {
void serviceLocated(SimpleCloseable listenerHandler, ServiceInfo info);
+ /**
+ * Information about a located service.
+ */
final class ServiceInfo {
private URI serviceUri;
private URI locationUri;
- private int preference;
+ private int metric;
+ /**
+ * Get the URI of the located service.
+ *
+ * @return the URI
+ */
public URI getServiceUri() {
return serviceUri;
}
+ /**
+ * Set the URI of the located service.
+ *
+ * @param serviceUri the URI
+ */
public void setServiceUri(final URI serviceUri) {
this.serviceUri = serviceUri;
}
+ /**
+ * Get the URI of the location of the located service.
+ *
+ * @return the URI
+ */
public URI getLocationUri() {
return locationUri;
}
+ /**
+ * Set the URI of the location of the located service.
+ *
+ * @param locationUri the URI
+ */
public void setLocationUri(final URI locationUri) {
this.locationUri = locationUri;
}
- public int getPreference() {
- return preference;
+ /**
+ * Get the preference metric of this located service.
+ *
+ * @return the preference metric
+ */
+ public int getMetric() {
+ return metric;
}
- public void setPreference(final int preference) {
- this.preference = preference;
+ /**
+ * Set the preference metric of this located service.
+ *
+ * @param metric the preference metric
+ */
+ public void setMetric(final int metric) {
+ this.metric = metric;
}
}
}
Modified: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceRegistration.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-04-30 22:50:24 UTC (rev 5099)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceRegistration.java 2009-04-30 22:58:40 UTC (rev 5100)
@@ -60,13 +60,6 @@
(endpointName == null || endpointName.length() == 0 || "*".equals(endpointName) || endpointName.equals(this.endpointName));
}
- public boolean matches(final ServiceSpecification spec) {
- final String serviceType = spec.getServiceType();
- final String groupName = spec.getGroupName();
- final String endpointName = spec.getEndpointName();
- return matches(serviceType, groupName, endpointName);
- }
-
public boolean isRemote() {
return remote;
}
Deleted: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceSpecification.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceSpecification.java 2009-04-30 22:50:24 UTC (rev 5099)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/ServiceSpecification.java 2009-04-30 22:58:40 UTC (rev 5100)
@@ -1,158 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting3;
-
-import java.net.URI;
-
-/**
- * A specification of a JBoss Remoting service.
- *
- * @apiviz.exclude
- */
-public final class ServiceSpecification {
- private final String serviceType;
- private final String groupName;
- private final String endpointName;
-
- /**
- * Construct a new instance. Each argument is validated and converted into a canonical form. The arguments
- * may be "*" indicating that anything will match.
- *
- * @param serviceType the service type
- * @param groupName the group name
- * @param endpointName the endpoint name
- */
- public ServiceSpecification(final String serviceType, final String groupName, final String endpointName) {
- if (serviceType == null) {
- throw new NullPointerException("serviceType is null");
- }
- if (groupName == null) {
- throw new NullPointerException("groupName is null");
- }
- if (endpointName == null) {
- throw new NullPointerException("endpointName is null");
- }
- if (serviceType.length() > 0 && ! "*".equals(serviceType)) {
- ServiceURI.validateServiceType(serviceType);
- this.serviceType = serviceType.toLowerCase();
- } else {
- this.serviceType = "*";
- }
- if (groupName.length() > 0 && ! "*".equals(groupName)) {
- ServiceURI.validateGroupName(groupName);
- this.groupName = groupName.toLowerCase();
- } else {
- this.groupName = "*";
- }
- if (endpointName.length() > 0 && ! "*".equals(endpointName)) {
- ServiceURI.validateEndpointName(endpointName);
- this.endpointName = endpointName.toLowerCase();
- } else {
- this.endpointName = "*";
- }
- }
-
- /**
- * Create an instance from a service URI.
- *
- * @param uri the URI
- * @return the specificaion
- */
- public static ServiceSpecification fromUri(final URI uri) {
- return new ServiceSpecification(ServiceURI.getServiceType(uri), ServiceURI.getGroupName(uri), ServiceURI.getEndpointName(uri));
- }
-
- /**
- * Get the service type of this specification.
- *
- * @return the service type
- */
- public String getServiceType() {
- return serviceType;
- }
-
- /**
- * Get the group name of this specification.
- *
- * @return the group name
- */
- public String getGroupName() {
- return groupName;
- }
-
- /**
- * Get the endpoint name of this specification.
- *
- * @return the endpoint name
- */
- public String getEndpointName() {
- return endpointName;
- }
-
- /**
- * Determine whether the given URI matches this specification.
- *
- * @param serviceUri the service URI
- * @return {@code true} if the URI is a service which matches this specification
- */
- public boolean matches(final URI serviceUri) {
- if (! ServiceURI.isRemotingServiceUri(serviceUri)) {
- return false;
- }
- if (! "*".equals(serviceType)) {
- if (! serviceType.equals(ServiceURI.getServiceType(serviceUri))) {
- return false;
- }
- }
- if (! "*".equals(groupName)) {
- if (! groupName.equals(ServiceURI.getGroupName(serviceUri))) {
- return false;
- }
- }
- if (! "*".equals(endpointName)) {
- if (! endpointName.equals(ServiceURI.getEndpointName(serviceUri))) {
- return false;
- }
- }
- return true;
- }
-
- /** {@inheritDoc} */
- public boolean equals(final Object o) {
- if (this == o) return true;
- if (! (o instanceof ServiceSpecification)) return false;
- final ServiceSpecification that = (ServiceSpecification) o;
- if (!endpointName.equals(that.endpointName)) return false;
- if (!groupName.equals(that.groupName)) return false;
- if (!serviceType.equals(that.serviceType)) return false;
- return true;
- }
-
- /** {@inheritDoc} */
- public int hashCode() {
- int result = serviceType.hashCode();
- result = 31 * result + groupName.hashCode();
- result = 31 * result + endpointName.hashCode();
- return result;
- }
-}
Deleted: remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractConnectionProviderContext.java
===================================================================
--- remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractConnectionProviderContext.java 2009-04-30 22:50:24 UTC (rev 5099)
+++ remoting3/trunk/jboss-remoting/src/main/java/org/jboss/remoting3/spi/AbstractConnectionProviderContext.java 2009-04-30 22:58:40 UTC (rev 5100)
@@ -1,37 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2009, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.remoting3.spi;
-
-import java.util.concurrent.Executor;
-
-public abstract class AbstractConnectionProviderContext extends AbstractHandleableCloseable<ConnectionProviderContext> implements ConnectionProviderContext {
-
- /**
- * Basic constructor.
- *
- * @param executor the executor used to execute the close notification handlers
- */
- protected AbstractConnectionProviderContext(final Executor executor) {
- super(executor);
- }
-}
More information about the jboss-remoting-commits
mailing list