mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#716 - Remove createNamedQuery() and createQuery(Class<T> beanType, String query) ... use criteria API, query beans and RawSql
This commit is contained in:
1 parent
a20822a9e1
commit
11d623cb69
58 files changed
+56
-3578
No files matched your search
@@ -1,321 +0,0 @@
|
||||
package com.avaje.ebeaninternal.server.lib.util;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collection;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* A lightweight tree structure for simple XML handling.
|
||||
* <p>
|
||||
* It removes support for nodes being mixed with content. That is, a node can
|
||||
* only contain content or a list of one or more child nodes. It does not
|
||||
* support mixing bits of content between the child nodes.
|
||||
* </p>
|
||||
* <p>
|
||||
* Although designed to simplify XML in supported cases it can be used as a
|
||||
* general tree structure with attributes of java Objects.
|
||||
* </p>
|
||||
*/
|
||||
public class Dnode {
|
||||
|
||||
int level;
|
||||
|
||||
String nodeName;
|
||||
|
||||
String nodeContent;
|
||||
|
||||
ArrayList<Dnode> children;
|
||||
|
||||
final LinkedHashMap<String, String> attrList = new LinkedHashMap<String, String>();
|
||||
|
||||
/**
|
||||
* Create a node.
|
||||
*/
|
||||
public Dnode() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse the raw XML string.
|
||||
*/
|
||||
public static Dnode parse(String s){
|
||||
DnodeReader r = new DnodeReader();
|
||||
return r.parseXml(s);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the node as XML.
|
||||
*/
|
||||
public String toXml() {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
generate(sb);
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
/**
|
||||
* Generate this node as xml to the buffer.
|
||||
*/
|
||||
public void generate(StringBuilder sb) {
|
||||
if (sb == null) {
|
||||
sb = new StringBuilder();
|
||||
}
|
||||
sb.append("<").append(nodeName);
|
||||
for (String attr : attrList.keySet()) {
|
||||
Object attrValue = getAttribute(attr);
|
||||
sb.append(" ").append(attr).append("=\"");
|
||||
if (attrValue != null) {
|
||||
sb.append(attrValue);
|
||||
}
|
||||
sb.append("\"");
|
||||
}
|
||||
|
||||
if (nodeContent == null && !hasChildren()) {
|
||||
sb.append(" />");
|
||||
|
||||
} else {
|
||||
sb.append(">");
|
||||
if (children != null && children.size() > 0) {
|
||||
for (int i = 0; i < children.size(); i++) {
|
||||
Dnode child = children.get(i);
|
||||
child.generate(sb);
|
||||
}
|
||||
}
|
||||
if (nodeContent != null) {
|
||||
sb.append(nodeContent);
|
||||
}
|
||||
sb.append("</").append(nodeName).append(">");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the node name.
|
||||
*/
|
||||
public String getNodeName() {
|
||||
return nodeName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the node name.
|
||||
*/
|
||||
public void setNodeName(String nodeName) {
|
||||
this.nodeName = nodeName;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the node content.
|
||||
*/
|
||||
public String getNodeContent() {
|
||||
return nodeContent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the node content.
|
||||
*/
|
||||
public void setNodeContent(String nodeContent) {
|
||||
this.nodeContent = nodeContent;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return true if this node has children.
|
||||
*/
|
||||
public boolean hasChildren() {
|
||||
return getChildrenCount() > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the number of children this node has.
|
||||
*/
|
||||
public int getChildrenCount() {
|
||||
if (children == null) {
|
||||
return 0;
|
||||
}
|
||||
return children.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* Remove a ancestor node.
|
||||
*/
|
||||
public boolean remove(Dnode node) {
|
||||
if (children == null) {
|
||||
return false;
|
||||
}
|
||||
if (children.remove(node)) {
|
||||
return true;
|
||||
}
|
||||
for (Dnode child : children) {
|
||||
if (child.remove(node)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* List of children nodes.
|
||||
*/
|
||||
public List<Dnode> children() {
|
||||
if (children == null) {
|
||||
return null;
|
||||
}
|
||||
return children;
|
||||
}
|
||||
|
||||
/**
|
||||
* Add a child.
|
||||
*/
|
||||
public void addChild(Dnode child) {
|
||||
if (children == null) {
|
||||
children = new ArrayList<Dnode>();
|
||||
}
|
||||
children.add(child);
|
||||
child.setLevel(level + 1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the level or depth of the node from the root.
|
||||
*/
|
||||
public int getLevel() {
|
||||
return level;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the level or depth of this node from the root.
|
||||
*/
|
||||
public void setLevel(int level) {
|
||||
this.level = level;
|
||||
if (children != null) {
|
||||
for (int i = 0; i < children.size(); i++) {
|
||||
Dnode child = children.get(i);
|
||||
child.setLevel(level + 1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the first matching node using nodeName. This is a depth first tree
|
||||
* search.
|
||||
*/
|
||||
public Dnode find(String nodeName) {
|
||||
return find(nodeName, null, null);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the first node matching nodeName and attribute value. This is a
|
||||
* depth first tree search.
|
||||
*/
|
||||
public Dnode find(String nodeName, String attrName, Object value) {
|
||||
|
||||
return find(nodeName, attrName, value, -1);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Search for a single node with control over maxLevel. Find the first node
|
||||
* matching nodeName and attribute value. If attrName and value are null
|
||||
* then this will just search using the nodeName. This is a depth first tree
|
||||
* search. Once a matching node is found the search will stop.
|
||||
*/
|
||||
public Dnode find(String nodeName, String attrName, Object value, int maxLevel) {
|
||||
|
||||
ArrayList<Dnode> list = new ArrayList<Dnode>();
|
||||
findByNode(list, nodeName, true, attrName, value, maxLevel);
|
||||
if (list.size() >= 1) {
|
||||
return list.get(0);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find all the nodes that match the nodeName.
|
||||
*
|
||||
*/
|
||||
public List<Dnode> findAll(String nodeName, int maxLevel) {
|
||||
int level = -1;
|
||||
if (maxLevel > 0) {
|
||||
level = this.level + maxLevel;
|
||||
}
|
||||
return findAll(nodeName, null, null, level);
|
||||
}
|
||||
|
||||
/**
|
||||
* Find all the nodes that match the nodeName and attribute value.
|
||||
*/
|
||||
public List<Dnode> findAll(String nodeName, String attrName, Object value, int maxLevel) {
|
||||
|
||||
if (nodeName == null && attrName == null) {
|
||||
throw new RuntimeException("You can not have both nodeName and attrName null");
|
||||
}
|
||||
ArrayList<Dnode> list = new ArrayList<Dnode>();
|
||||
findByNode(list, nodeName, false, attrName, value, maxLevel);
|
||||
return list;
|
||||
}
|
||||
|
||||
/**
|
||||
* Used for recursive calling.
|
||||
*/
|
||||
private void findByNode(List<Dnode> list, String node, boolean findOne,String attrName, Object value, int maxLevel) {
|
||||
|
||||
if (findOne && list.size() == 1) {
|
||||
return;
|
||||
}
|
||||
if (node == null || node.equals(nodeName)) {
|
||||
if (attrName == null || value.equals(getAttribute(attrName))) {
|
||||
list.add(this);
|
||||
if (findOne) {
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (maxLevel > 0 && level >= maxLevel) {
|
||||
// hit max level
|
||||
|
||||
} else if (children != null) {
|
||||
// recursively search the children
|
||||
for (int i = 0; i < children.size(); i++) {
|
||||
Dnode child = children.get(i);
|
||||
child.findByNode(list, node, findOne, attrName, value,maxLevel);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The attribute names as strings.
|
||||
*/
|
||||
public Collection<String> attributeNames() {
|
||||
return attrList.keySet();
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the attribute for a given name.
|
||||
*/
|
||||
public String getAttribute(String name) {
|
||||
return attrList.get(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns an Attribute as a String.
|
||||
* <p>
|
||||
* Will throw a ClassCastException if the attribute is not a String.
|
||||
* </p>
|
||||
*/
|
||||
public String getStringAttr(String name, String defaultValue) {
|
||||
Object o = attrList.get(name);
|
||||
if (o == null){
|
||||
return defaultValue;
|
||||
} else {
|
||||
return o.toString();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Set an attribute.
|
||||
*/
|
||||
public void setAttribute(String name, String value) {
|
||||
attrList.put(name, value);
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return "[" + getNodeName() + " " + attrList + "]";
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,200 +0,0 @@
|
||||
package com.avaje.ebeaninternal.server.lib.util;
|
||||
|
||||
import java.util.Stack;
|
||||
|
||||
import org.xml.sax.Attributes;
|
||||
import org.xml.sax.SAXException;
|
||||
import org.xml.sax.helpers.DefaultHandler;
|
||||
|
||||
/**
|
||||
* Parse an xml document into a Dnode tree.
|
||||
*/
|
||||
public class DnodeParser extends DefaultHandler {
|
||||
|
||||
/**
|
||||
* The root of the DContent tree.
|
||||
*/
|
||||
Dnode root;
|
||||
|
||||
/**
|
||||
* The current node being parsed.
|
||||
*/
|
||||
Dnode currentNode;
|
||||
|
||||
/**
|
||||
* The nodeContent buffer.
|
||||
*/
|
||||
StringBuilder buffer;
|
||||
|
||||
/**
|
||||
* Used to stack the nodes.
|
||||
*/
|
||||
final Stack<Dnode> stack = new Stack<Dnode>();
|
||||
|
||||
/**
|
||||
* The class used to construct new nodes. Should be Dnode or a subtype of
|
||||
* Dnode.
|
||||
*/
|
||||
Class<?> nodeClass = Dnode.class;
|
||||
|
||||
int depth = 0;
|
||||
|
||||
/**
|
||||
* Trim whitespace from the content.
|
||||
*/
|
||||
boolean trimWhitespace = true;
|
||||
|
||||
/**
|
||||
* The name of the tag that contains html content
|
||||
*/
|
||||
String contentName;
|
||||
|
||||
/**
|
||||
* The depth of the tag that contains the html content
|
||||
*/
|
||||
int contentDepth;
|
||||
|
||||
|
||||
/**
|
||||
* If true then trim the whitespace from the content.
|
||||
*/
|
||||
public boolean isTrimWhitespace() {
|
||||
return trimWhitespace;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set whether to trim whitespace from the content.
|
||||
*/
|
||||
public void setTrimWhitespace(boolean trimWhitespace) {
|
||||
this.trimWhitespace = trimWhitespace;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the root node of the DContent tree.
|
||||
*/
|
||||
public Dnode getRoot() {
|
||||
return root;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set the type class of node to be created.
|
||||
*/
|
||||
public void setNodeClass(Class<?> nodeClass) {
|
||||
this.nodeClass = nodeClass;
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a new Dnode using the nodeClass.
|
||||
*/
|
||||
private Dnode createNewNode() {
|
||||
try {
|
||||
return (Dnode) nodeClass.newInstance();
|
||||
} catch (Exception ex) {
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* process a startElement.
|
||||
*/
|
||||
public void startElement(String uri, String localName, String qName, Attributes attributes)
|
||||
throws SAXException {
|
||||
|
||||
super.startElement(uri, localName, qName, attributes);
|
||||
depth++;
|
||||
|
||||
boolean isContent = (contentName != null);
|
||||
|
||||
if (isContent){
|
||||
// must be html content... add the begin tag as content
|
||||
buffer.append("<").append(localName);
|
||||
for (int i = 0; i < attributes.getLength(); i++) {
|
||||
String key = attributes.getLocalName(i);
|
||||
String val = attributes.getValue(i);
|
||||
buffer.append(" ").append(key).append("='").append(val).append("'");
|
||||
}
|
||||
buffer.append(">");
|
||||
return;
|
||||
|
||||
}
|
||||
|
||||
buffer = new StringBuilder();
|
||||
Dnode node = createNewNode();
|
||||
node.setNodeName(localName);
|
||||
for (int i = 0; i < attributes.getLength(); i++) {
|
||||
String key = attributes.getLocalName(i);
|
||||
String val = attributes.getValue(i);
|
||||
node.setAttribute(key, val);
|
||||
if ("type".equalsIgnoreCase(key) && "content".equalsIgnoreCase(val)) {
|
||||
// this tag contains html content
|
||||
// no more nodes until end tag is found
|
||||
contentName = localName;
|
||||
contentDepth = depth-1;
|
||||
}
|
||||
|
||||
}
|
||||
if (root == null) {
|
||||
root = node;
|
||||
}
|
||||
if (currentNode != null) {
|
||||
currentNode.addChild(node);
|
||||
}
|
||||
stack.push(node);
|
||||
currentNode = node;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* append the node content.
|
||||
*/
|
||||
public void characters(char[] ch, int start, int length) throws SAXException {
|
||||
super.characters(ch, start, length);
|
||||
String s = new String(ch, start, length);
|
||||
int p = s.indexOf('\r');
|
||||
int p2 = s.indexOf('\n');
|
||||
if (p == -1 && p2 > -1) {
|
||||
// This is probably not an issue but tidys up content
|
||||
// in my text editor
|
||||
s = StringHelper.replaceString(s, "\n", "\r\n");
|
||||
}
|
||||
buffer.append(s);
|
||||
}
|
||||
|
||||
/**
|
||||
* process the endElement.
|
||||
*/
|
||||
public void endElement(String uri, String localName, String qName) throws SAXException {
|
||||
super.endElement(uri, localName, qName);
|
||||
depth--;
|
||||
|
||||
if (contentName != null){
|
||||
// is this the end of the content?
|
||||
if (contentName.equals(localName) && contentDepth == depth){
|
||||
contentName = null;
|
||||
|
||||
} else {
|
||||
// the html content end tag
|
||||
buffer.append("</").append(localName).append(">");
|
||||
}
|
||||
return;
|
||||
}
|
||||
String content = buffer.toString();
|
||||
buffer.setLength(0);
|
||||
if (content.length() > 0) {
|
||||
if (trimWhitespace) {
|
||||
content = content.trim();
|
||||
}
|
||||
if (content.length() > 0) {
|
||||
currentNode.setNodeContent(content);
|
||||
}
|
||||
}
|
||||
stack.pop();
|
||||
if (!stack.isEmpty()) {
|
||||
// get the new currentNode
|
||||
currentNode = stack.pop();
|
||||
stack.push(currentNode);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,70 +0,0 @@
|
||||
package com.avaje.ebeaninternal.server.lib.util;
|
||||
|
||||
import java.io.ByteArrayInputStream;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStreamWriter;
|
||||
import java.io.StringReader;
|
||||
|
||||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.XMLReader;
|
||||
import org.xml.sax.helpers.XMLReaderFactory;
|
||||
|
||||
/**
|
||||
* Parses an XML inputstream returning a Dnode tree.
|
||||
*/
|
||||
public class DnodeReader {
|
||||
|
||||
public Dnode parseXml(String str) {
|
||||
|
||||
try {
|
||||
ByteArrayOutputStream bao = new ByteArrayOutputStream(str.length());
|
||||
OutputStreamWriter osw = new OutputStreamWriter(bao);
|
||||
|
||||
StringReader sr = new StringReader(str);
|
||||
|
||||
int charBufferSize = 1024;
|
||||
char[] buf = new char[charBufferSize];
|
||||
int len;
|
||||
while ((len = sr.read(buf, 0, buf.length)) != -1) {
|
||||
osw.write(buf, 0, len);
|
||||
}
|
||||
sr.close();
|
||||
osw.flush();
|
||||
osw.close();
|
||||
|
||||
bao.flush();
|
||||
bao.close();
|
||||
|
||||
InputStream is = new ByteArrayInputStream(bao.toByteArray());
|
||||
return parseXml(is);
|
||||
|
||||
} catch (IOException ex){
|
||||
throw new RuntimeException(ex);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse the XML inputstream returning the Dnode tree.
|
||||
*/
|
||||
public Dnode parseXml(InputStream in) {
|
||||
|
||||
try {
|
||||
InputSource inSource = new InputSource(in);
|
||||
|
||||
DnodeParser parser = new DnodeParser();
|
||||
|
||||
XMLReader myReader = XMLReaderFactory.createXMLReader();
|
||||
myReader.setContentHandler(parser);
|
||||
|
||||
myReader.parse(inSource);
|
||||
|
||||
return parser.getRoot();
|
||||
|
||||
} catch (Exception e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user