[jboss-svn-commits] JBL Code SVN: r31563 - in labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools: xml and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 11 10:45:57 EST 2010
Author: baunax
Date: 2010-02-11 10:45:56 -0500 (Thu, 11 Feb 2010)
New Revision: 31563
Added:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbMapAdapter.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbPair.java
Removed:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultAdapter.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultPair.java
Modified:
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java
labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultsMap.java
Log:
refactored ExecutionResult(Pair|Adapter) to a generic name so it could be used in other classes
Deleted: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultAdapter.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultAdapter.java 2010-02-11 15:10:57 UTC (rev 31562)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultAdapter.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -1,34 +0,0 @@
-package org.drools.runtime.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-public class ExecutionResultAdapter extends XmlAdapter<ExecutionResultPair[], Map<String,Object>> {
-
- @Override
- public ExecutionResultPair[] marshal(Map<String, Object> value) throws Exception {
- if (value == null || value.isEmpty()) {
- return new ExecutionResultPair[0];
- }
- List<ExecutionResultPair> ret = new ArrayList<ExecutionResultPair>(value.size());
- for (Map.Entry<String, Object> entry : value.entrySet()) {
- ret.add(new ExecutionResultPair(entry.getKey(), entry.getValue()));
- }
-
- return ret.toArray(new ExecutionResultPair[value.size()]);
- }
-
- @Override
- public Map<String, Object> unmarshal(ExecutionResultPair[] value) throws Exception {
- Map<String, Object> r = new HashMap<String, Object>();
- for( ExecutionResultPair p : value ) {
- r.put(p.getKey(), p.getValue());
- }
- return r;
- }
-
-}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java 2010-02-11 15:10:57 UTC (rev 31562)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultImpl.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -12,6 +12,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.drools.runtime.ExecutionResults;
+import org.drools.xml.jaxb.util.JaxbMapAdapter;
@XmlRootElement(name="execution-results")
@XmlAccessorType(XmlAccessType.NONE)
@@ -19,11 +20,11 @@
private static final long serialVersionUID = 1L;
- @XmlJavaTypeAdapter(ExecutionResultAdapter.class)
+ @XmlJavaTypeAdapter(JaxbMapAdapter.class)
@XmlElement(name="results")
HashMap<String, Object> results = new HashMap<String, Object>();
- @XmlJavaTypeAdapter(ExecutionResultAdapter.class)
+ @XmlJavaTypeAdapter(JaxbMapAdapter.class)
@XmlElement(name="facts")
HashMap<String, Object> facts = new HashMap<String, Object>();
Deleted: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultPair.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultPair.java 2010-02-11 15:10:57 UTC (rev 31562)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultPair.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -1,71 +0,0 @@
-package org.drools.runtime.impl;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-
- at XmlAccessorType(XmlAccessType.NONE)
-public class ExecutionResultPair {
-
- @XmlAttribute(name = "key")
- private String key;
-
- @XmlElement
- private Object value;
-
- public ExecutionResultPair() {
- }
-
- public ExecutionResultPair(String key, Object value) {
- this.key = key;
- this.value = value;
- }
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public Object getValue() {
- return value;
- }
-
- public void setValue(Object value) {
- this.value = value;
- }
-
- @Override
- public int hashCode() {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((key == null) ? 0 : key.hashCode());
- result = prime * result + ((value == null) ? 0 : value.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
- ExecutionResultPair other = (ExecutionResultPair) obj;
- if (key == null) {
- if (other.key != null)
- return false;
- } else if (!key.equals(other.key))
- return false;
- if (value == null) {
- if (other.value != null)
- return false;
- } else if (!value.equals(other.value))
- return false;
- return true;
- }
-}
Modified: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultsMap.java
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultsMap.java 2010-02-11 15:10:57 UTC (rev 31562)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultsMap.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -6,7 +6,9 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
- at XmlJavaTypeAdapter(ExecutionResultAdapter.class)
+import org.drools.xml.jaxb.util.JaxbMapAdapter;
+
+ at XmlJavaTypeAdapter(JaxbMapAdapter.class)
public class ExecutionResultsMap {
Map<String, Object> results = new HashMap<String, Object>();
Copied: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbMapAdapter.java (from rev 31557, labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultAdapter.java)
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbMapAdapter.java (rev 0)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbMapAdapter.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -0,0 +1,35 @@
+package org.drools.xml.jaxb.util;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.bind.annotation.adapters.XmlAdapter;
+
+
+public class JaxbMapAdapter extends XmlAdapter<JaxbPair[], Map<String,Object>> {
+
+ @Override
+ public JaxbPair[] marshal(Map<String, Object> value) throws Exception {
+ if (value == null || value.isEmpty()) {
+ return new JaxbPair[0];
+ }
+ List<JaxbPair> ret = new ArrayList<JaxbPair>(value.size());
+ for (Map.Entry<String, Object> entry : value.entrySet()) {
+ ret.add(new JaxbPair(entry.getKey(), entry.getValue()));
+ }
+
+ return ret.toArray(new JaxbPair[value.size()]);
+ }
+
+ @Override
+ public Map<String, Object> unmarshal(JaxbPair[] value) throws Exception {
+ Map<String, Object> r = new HashMap<String, Object>();
+ for( JaxbPair p : value ) {
+ r.put(p.getKey(), p.getValue());
+ }
+ return r;
+ }
+
+}
Copied: labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbPair.java (from rev 31557, labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/runtime/impl/ExecutionResultPair.java)
===================================================================
--- labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbPair.java (rev 0)
+++ labs/jbossrules/branches/camel_jaxb_marshaller2-lucaz/drools-core/src/main/java/org/drools/xml/jaxb/util/JaxbPair.java 2010-02-11 15:45:56 UTC (rev 31563)
@@ -0,0 +1,71 @@
+package org.drools.xml.jaxb.util;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+
+ at XmlAccessorType(XmlAccessType.NONE)
+public class JaxbPair {
+
+ @XmlAttribute(name = "key")
+ private String key;
+
+ @XmlElement
+ private Object value;
+
+ public JaxbPair() {
+ }
+
+ public JaxbPair(String key, Object value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((key == null) ? 0 : key.hashCode());
+ result = prime * result + ((value == null) ? 0 : value.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ JaxbPair other = (JaxbPair) obj;
+ if (key == null) {
+ if (other.key != null)
+ return false;
+ } else if (!key.equals(other.key))
+ return false;
+ if (value == null) {
+ if (other.value != null)
+ return false;
+ } else if (!value.equals(other.value))
+ return false;
+ return true;
+ }
+}
More information about the jboss-svn-commits
mailing list