diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/DecisionTree.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/DecisionTree.java index 1e5bf9ea1c..61335e0b9a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/DecisionTree.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/DecisionTree.java @@ -28,6 +28,8 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; import com.raytheon.uf.common.dataquery.requests.RequestConstraint; import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintType; @@ -43,12 +45,15 @@ import com.raytheon.uf.common.dataquery.requests.RequestConstraint.ConstraintTyp * *
* SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 3, 2007 chammack Initial Creation. - * Jan 14, 2013 1442 rferrel Added method searchTreeUsingContraints. - * Addition checks on constraints. - * May 28, 2013 1638 mschenke Added proper support for {@link ConstraintType#ISNULL} + * Date Ticket# Engineer Description + * ------------- -------- ----------- ----------------------------------------- + * Jul 03, 2007 chammack Initial Creation. + * Jan 14, 2013 1442 rferrel Added method searchTreeUsingContraints. + * Addition checks on constraints. + * May 28, 2013 1638 mschenke Added proper support for + * {@link ConstraintType#ISNULL} + * Dec 18, 2013 2579 bsteffen Replace synchronization with a + * read/write lock. * ** @@ -94,9 +99,7 @@ public class DecisionTree
* SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * 11/07/08 #1673 bphillip Initial Creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Nov 07, 2008 1673 bphillip Initial Creation + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject + * ** * @author bphillip * @version 1.0 */ @DynamicSerialize -public class QueryResult implements ISerializableObject { +public class QueryResult { /** A mapping of the column names to their index in the result */ @DynamicSerializeElement @@ -167,12 +168,10 @@ public class QueryResult implements ISerializableObject { */ public String[] getColumnNameArray() { String[] names = new String[columnNames.size()]; - int i = 0; for (Iterator
* SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * 11/07/08 #1673 bphillip Initial Creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Nov 07, 2008 1673 bphillip Initial Creation + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject + * ** * @author bphillip * @version 1.0 */ @DynamicSerialize -public class QueryResultRow implements ISerializableObject { +public class QueryResultRow { /** * The values of the returned columns diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/DbQueryRequestSet.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/DbQueryRequestSet.java index 517d84dda3..d9c50dde79 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/DbQueryRequestSet.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/DbQueryRequestSet.java @@ -24,20 +24,24 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.comm.IServerRequest; /** - * TODO Add Description + * Send multiple {@link DbQueryRequestSet}s at once. This can be more efficient + * than sending multiple requests individually because it reduces the network + * overhead. * *
* * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jun 30, 2011 rjpeter Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jun 30, 2011 rjpeter Initial creation + * Dec 18, 2013 2579 bsteffen Class javadoc * ** * @author rjpeter * @version 1.0 + * @see DbQueryRequest */ @DynamicSerialize public class DbQueryRequestSet implements IServerRequest { diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/QlServerRequest.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/QlServerRequest.java index 701dc92882..464044a9c9 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/QlServerRequest.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/QlServerRequest.java @@ -21,7 +21,6 @@ package com.raytheon.uf.common.dataquery.requests; import java.util.Map; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; import com.raytheon.uf.common.serialization.comm.IServerRequest; @@ -32,9 +31,10 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest; *
* * SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Feb 16, 2011 #8070 ekladstrup Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Feb 16, 2011 8070 ekladstrup Initial creation + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject * ** @@ -42,7 +42,7 @@ import com.raytheon.uf.common.serialization.comm.IServerRequest; * @version 1.0 */ @DynamicSerialize -public class QlServerRequest implements IServerRequest, ISerializableObject { +public class QlServerRequest implements IServerRequest { @DynamicSerializeElement private Map
* - * SOFTWARE HISTORY + * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Aug 21, 2007 chammack Initial Creation. - * May 27, 2009 2408 jsanchez Cast value to String. - * Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert - * all non-numeric objects to String - * Nov 05, 2009 3553 rjpeter Added isNull capability. - * Jul 09, 2013 1869 bsteffen Format Calendar when making - * Constraint Mapping. + * Date Ticket# Engineer Description + * ------------- -------- ----------- ----------------------------------------- + * Aug 21, 2007 chammack Initial Creation. + * May 27, 2009 2408 jsanchez Cast value to String. + * Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert all + * non-numeric objects to String + * Nov 05, 2009 3553 rjpeter Added isNull capability. + * Jul 09, 2013 1869 bsteffen Format Calendar when making Constraint + * Mapping. + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject + * * ** @@ -73,7 +75,7 @@ import com.raytheon.uf.common.time.util.TimeUtil; @XmlRootElement(name = "requestConstraint") @XmlType(name = "requestConstraint") @DynamicSerialize -public class RequestConstraint implements ISerializableObject, Cloneable { +public class RequestConstraint implements Cloneable { public static final RequestConstraint WILDCARD; static { @@ -114,7 +116,8 @@ public class RequestConstraint implements ISerializableObject, Cloneable { @DynamicSerializeElement protected String constraintValue; - protected transient Map
* * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 1, 2011 rjpeter Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jul0 1, 2011 rjpeter Initial creation + * Dec 18, 2013 2579 bsteffen Class javadoc * ** * @author rjpeter * @version 1.0 + * @see TimeQueryRequest */ @DynamicSerialize public class TimeQueryRequestSet implements IServerRequest { diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponse.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponse.java index 8ccf58cdd5..14762e63c2 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponse.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponse.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.raytheon.uf.common.serialization.ISerializableObject; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; @@ -37,9 +36,10 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; *
* * SOFTWARE HISTORY - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jan 21, 2010 mschenke Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jan 21, 2010 mschenke Initial creation + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject * ** @@ -47,7 +47,7 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; * @version 1.0 */ @DynamicSerialize -public class DbQueryResponse implements ISerializableObject { +public class DbQueryResponse { public static final String ENTITY_RESULT_KEY = null; diff --git a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponseSet.java b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponseSet.java index 82c1c7bbeb..1e7b421475 100644 --- a/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponseSet.java +++ b/edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/responses/DbQueryResponseSet.java @@ -19,28 +19,32 @@ **/ package com.raytheon.uf.common.dataquery.responses; -import com.raytheon.uf.common.serialization.ISerializableObject; +import com.raytheon.uf.common.dataquery.requests.DbQueryRequestSet; import com.raytheon.uf.common.serialization.annotations.DynamicSerialize; import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement; /** - * TODO Add Description + * Response to a {@link DbQueryResponseSet}, contains a response to every + * request in the same order. * *
* * SOFTWARE HISTORY * - * Date Ticket# Engineer Description - * ------------ ---------- ----------- -------------------------- - * Jul 1, 2011 rjpeter Initial creation + * Date Ticket# Engineer Description + * ------------- -------- ----------- -------------------------- + * Jul 01, 2011 rjpeter Initial creation + * Dec 18, 2013 2579 bsteffen Remove ISerializableObject * ** * @author rjpeter * @version 1.0 + * @see DbQueryResponse + * @see DbQueryRequestSet */ @DynamicSerialize -public class DbQueryResponseSet implements ISerializableObject { +public class DbQueryResponseSet { @DynamicSerializeElement private DbQueryResponse[] results;