This adds a couple of value expressions for queries and the query evaluation context.
Changelog:
2007-01-14 Andrew John Hughes <[EMAIL PROTECTED]>
* javax/management/AttributeValueExp.java: New file.
* javax/management/QueryEval.java: Likewise.
* javax/management/StringValueExp.java: Likewise.
--
Andrew :-)
Escape the Java Trap with GNU Classpath!
http://www.gnu.org/philosophy/java-trap.html
public class gcj extends Freedom implements Java { ... }
Index: javax/management/AttributeValueExp.java
===================================================================
RCS file: javax/management/AttributeValueExp.java
diff -N javax/management/AttributeValueExp.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/management/AttributeValueExp.java 14 Jan 2007 23:24:35 -0000
@@ -0,0 +1,181 @@
+/* AttributeValueExp.java -- Represents attributes to be passed to queries.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+/**
+ * Represents an attribute value being used as an argument
+ * to a relational constraint.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public class AttributeValueExp
+ implements ValueExp
+{
+
+ /**
+ * Compatible with JDK 1.5
+ */
+ private static final long serialVersionUID = -776802504653916338L;
+
+ /**
+ * The name of the attribute.
+ */
+ private String attr;
+
+ /**
+ * Constructs a new [EMAIL PROTECTED] AttributeValueExp}.
+ *
+ * @deprecated An instance created with a <code>null</code>
+ * attribute name can not be used in a query.
+ */
+ @Deprecated public AttributeValueExp()
+ {
+ }
+
+ /**
+ * Constructs a new [EMAIL PROTECTED] AttributeValueExp} using the
+ * specified attribute.
+ *
+ * @param attr the name of the attribute whose value
+ * will be used for this expression.
+ */
+ public AttributeValueExp(String attr)
+ {
+ this.attr = attr;
+ }
+
+ /**
+ * Applies the [EMAIL PROTECTED] AttributeValueExp} to the specified
+ * management bean by obtaining the attribute value from
+ * the [EMAIL PROTECTED] MBeanServer} and using it to create a
+ * [EMAIL PROTECTED] StringValueExp}.
+ *
+ * @param name the [EMAIL PROTECTED] ObjectName} of the bean to obtain
+ * the value from.
+ * @return a [EMAIL PROTECTED] StringValueExp} containing the result.
+ * @throws BadStringOperationException if an invalid string
+ * operation is used by
+ * the value expression.
+ * @throws BadBinaryOpValueExpException if an invalid expression
+ * is used by the value expression.
+ * @throws BadAttributeValueExpException if an invalid attribute
+ * is used by the value expression.
+ * @throws InvalidApplicationException if the value expression is applied
+ * to the wrong type of bean.
+ */
+ public ValueExp apply(ObjectName name)
+ throws BadStringOperationException, BadBinaryOpValueExpException,
+ BadAttributeValueExpException, InvalidApplicationException
+ {
+ Object val = getAttribute(name);
+ if (val == null || !(val instanceof String))
+ throw new BadAttributeValueExpException(val);
+ return new StringValueExp((String) val);
+ }
+
+ /**
+ * Returns the value of the attribute by calling the
+ * [EMAIL PROTECTED] MBeanServer#getAttribute(ObjectName)} method of
+ * the server returned by [EMAIL PROTECTED] QueryEval#getMBeanServer()}.
+ * If an exception occurs, <code>null</code> is returned.
+ *
+ * @param name the [EMAIL PROTECTED] ObjectName} of the bean to obtain
+ * the value from.
+ * @return a [EMAIL PROTECTED] StringValueExp} containing the result.
+ */
+ protected Object getAttribute(ObjectName name)
+ {
+ try
+ {
+ return QueryEval.getMBeanServer().getAttribute(name, attr);
+ }
+ catch (NullPointerException e)
+ {
+ return null;
+ }
+ catch (MBeanException e)
+ {
+ return null;
+ }
+ catch (AttributeNotFoundException e)
+ {
+ return null;
+ }
+ catch (InstanceNotFoundException e)
+ {
+ return null;
+ }
+ catch (ReflectionException e)
+ {
+ return null;
+ }
+ }
+
+ /**
+ * Returns the attribute name.
+ *
+ * @return the attribute name.
+ */
+ public String getAttributeName()
+ {
+ return attr;
+ }
+
+ /**
+ * Sets the [EMAIL PROTECTED] MBeanServer} on which the query
+ * will be performed.
+ *
+ * @param server the new server.
+ */
+ public void setMBeanServer(MBeanServer server)
+ {
+ /* This seems to do nothing any more */
+ }
+
+ /**
+ * Returns the attribute name, quoted.
+ *
+ * @return the quoted attribute name.
+ */
+ public String toString()
+ {
+ return "'" + attr + "'";
+ }
+
+}
Index: javax/management/QueryEval.java
===================================================================
RCS file: javax/management/QueryEval.java
diff -N javax/management/QueryEval.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/management/QueryEval.java 14 Jan 2007 23:24:35 -0000
@@ -0,0 +1,95 @@
+/* QueryEval.java -- An evaluation context for a MBean server query.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+import java.io.Serializable;
+
+/**
+ * Represents the evaluation context of a [EMAIL PROTECTED] MBeanServer}
+ * query by retaining the server used on a thread-by-thread
+ * basis.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public class QueryEval
+ implements Serializable
+{
+
+ /**
+ * Compatible with JDK 1.5
+ */
+ private static final long serialVersionUID = 2675899265640874796L;
+
+ /**
+ * Stores the server used, on a
+ * thread-by-thread basis.
+ */
+ private static InheritableThreadLocal<MBeanServer> server =
+ new InheritableThreadLocal<MBeanServer>();
+
+ /**
+ * Returns the [EMAIL PROTECTED] MBeanServer} last supplied to the
+ * [EMAIL PROTECTED] #setMBeanServer(MBeanServer)} method. If this method
+ * has not been called for this thread, then the value will be
+ * inherited from any parent thread on which the method has
+ * been called. If the method has never been called, then
+ * <code>null</code> is returned.
+ *
+ * @return the server.
+ * @see #setMBeanServer(MBeanServer)
+ */
+ public static MBeanServer getMBeanServer()
+ {
+ return server.get();
+ }
+
+ /**
+ * Sets the [EMAIL PROTECTED] MBeanServer} on which the query will be
+ * performed. This value is inherited automatically by
+ * child threads. This method is only non-static for historical
+ * reasons; it makes no use of instance-related values.
+ *
+ * @param svr the server to use.
+ */
+ public void setMBeanServer(MBeanServer svr)
+ {
+ server.set(svr);
+ }
+
+}
Index: javax/management/StringValueExp.java
===================================================================
RCS file: javax/management/StringValueExp.java
diff -N javax/management/StringValueExp.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ javax/management/StringValueExp.java 14 Jan 2007 23:24:35 -0000
@@ -0,0 +1,133 @@
+/* StringValueExp.java -- Represents strings to be passed to queries.
+ Copyright (C) 2007 Free Software Foundation, Inc.
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath 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
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING. If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library. Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module. An independent module is a module which is not derived from
+or based on this library. If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so. If you do not wish to do so, delete this
+exception statement from your version. */
+
+package javax.management;
+
+/**
+ * Represents a string being used as an argument
+ * to a relational constraint.
+ *
+ * @author Andrew John Hughes ([EMAIL PROTECTED])
+ * @since 1.5
+ */
+public class StringValueExp
+ implements ValueExp
+{
+
+ /**
+ * Compatible with JDK 1.5
+ */
+ private static final long serialVersionUID = -3256390509806284044L;
+
+ /**
+ * The string value.
+ */
+ private String val;
+
+ /**
+ * Constructs a new [EMAIL PROTECTED] StringValueExp}.
+ */
+ public StringValueExp()
+ {
+ }
+
+ /**
+ * Constructs a new [EMAIL PROTECTED] StringValueExp} using the
+ * specified value.
+ *
+ * @param val the string value used for this expression.
+ */
+ public StringValueExp(String val)
+ {
+ this.val = val;
+ }
+
+ /**
+ * Applies the [EMAIL PROTECTED] StringValueExp} to the specified
+ * management bean by simply returning the value.
+ *
+ * @param name the [EMAIL PROTECTED] ObjectName} of the bean.
+ * @return the [EMAIL PROTECTED] StringValueExp} itself.
+ * @throws BadStringOperationException if an invalid string
+ * operation is used by
+ * the value expression.
+ * @throws BadBinaryOpValueExpException if an invalid expression
+ * is used by the value expression.
+ * @throws BadAttributeValueExpException if an invalid attribute
+ * is used by the value expression.
+ * @throws InvalidApplicationException if the value expression is applied
+ * to the wrong type of bean.
+ */
+ public ValueExp apply(ObjectName name)
+ throws BadStringOperationException, BadBinaryOpValueExpException,
+ BadAttributeValueExpException, InvalidApplicationException
+ {
+ return this;
+ }
+
+ /**
+ * Returns the value.
+ *
+ * @return the value.
+ */
+ public String getValue()
+ {
+ return val;
+ }
+
+ /**
+ * Sets the [EMAIL PROTECTED] MBeanServer} on which the query
+ * will be performed.
+ *
+ * @param server the new server.
+ */
+ public void setMBeanServer(MBeanServer server)
+ {
+ /* This seems to do nothing any more */
+ }
+
+ /**
+ * Returns the value in quotes.
+ *
+ * @return the value (quoted).
+ */
+ public String toString()
+ {
+ return "'" + val + "'";
+ }
+
+}
signature.asc
Description: Digital signature
