[teiid-commits] teiid SVN: r1978 - trunk/client-jdbc/src/main/java/org/teiid/jdbc.

Author: shawkins Date: 2010-03-19 13:32:08 -0400 (Fri, 19 Mar 2010) New Revision: 1978 Removed: trunk/client-jdbc/src/main/java/org/teiid/jdbc/AnnotationImpl.java trunk/client-jdbc/src/main/java/org/teiid/jdbc/BatchFetcher.java trunk/client-jdbc/src/main/java/org/teiid/jdbc/PlanNodeImpl.java Log: TEIID-1020 TEIID-918 moved the plan api under jdbc.plan. also fixed vdb resources to start with / Deleted: trunk/client-jdbc/src/main/java/org/teiid/jdbc/AnnotationImpl.java =================================================================== --- trunk/client-jdbc/src/main/java/org/teiid/jdbc/AnnotationImpl.java 2010-03-19 16:17:09 UTC (rev 1977) +++ trunk/client-jdbc/src/main/java/org/teiid/jdbc/AnnotationImpl.java 2010-03-19 17:32:08 UTC (rev 1978) @@ -1,64 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.jdbc; - -import org.teiid.plan.api.Annotation; - -/** - */ -public class AnnotationImpl implements Annotation { - - private String category; - private String description; - private String resolution; - private int severity; - - AnnotationImpl(String[] serverAnnotation) { - category = serverAnnotation[0]; - description = serverAnnotation[1]; - resolution = serverAnnotation[2]; - - severity = Integer.parseInt(serverAnnotation[3]); - } - - public String getCategory() { - return category; - } - - public String getAnnotation() { - return description; - } - - public String getResolution() { - return resolution; - } - - public int getSeverity() { - return severity; - } - - public String toString() { - return description; - } - -} Deleted: trunk/client-jdbc/src/main/java/org/teiid/jdbc/BatchFetcher.java =================================================================== --- trunk/client-jdbc/src/main/java/org/teiid/jdbc/BatchFetcher.java 2010-03-19 16:17:09 UTC (rev 1977) +++ trunk/client-jdbc/src/main/java/org/teiid/jdbc/BatchFetcher.java 2010-03-19 17:32:08 UTC (rev 1978) @@ -1,35 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.jdbc; - -import java.sql.SQLException; - -import org.teiid.jdbc.BatchResults.Batch; - - -/** - * @since 4.3 - */ -public interface BatchFetcher { - Batch requestBatch(int beginRow) throws SQLException; -} Deleted: trunk/client-jdbc/src/main/java/org/teiid/jdbc/PlanNodeImpl.java =================================================================== --- trunk/client-jdbc/src/main/java/org/teiid/jdbc/PlanNodeImpl.java 2010-03-19 16:17:09 UTC (rev 1977) +++ trunk/client-jdbc/src/main/java/org/teiid/jdbc/PlanNodeImpl.java 2010-03-19 17:32:08 UTC (rev 1978) @@ -1,100 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * See the COPYRIGHT.txt file distributed with this work for information - * regarding copyright ownership. Some portions may be licensed - * to Red Hat, Inc. under one or more contributor license agreements. - * - * This library 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 library 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 library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301 USA. - */ - -package org.teiid.jdbc; - -import java.util.*; - -import org.teiid.plan.api.PlanNode; - - -/** - * Implements the plan node - */ -class PlanNodeImpl implements PlanNode { - - private Map props; - private PlanNode parent; - private List children = new ArrayList(); - - /** - * - */ - PlanNodeImpl(Map props) { - this.props = props; - } - - void setParent(PlanNode parent) { - this.parent = parent; - } - - public PlanNode getParent() { - return this.parent; - } - - void addChild(PlanNode child) { - children.add(child); - } - - public List getChildren() { - return this.children; - } - - public Map getProperties() { - return this.props; - } - - private static final String PROP_CHILDREN = "children"; //$NON-NLS-1$ - - static PlanNode constructFromMap(Map properties) { - // Construct node without child property - Map copy = new HashMap(properties); - List childMaps = (List) copy.remove(PROP_CHILDREN); - - // Convert any subplans to PlanNodes as well - Iterator keyIter = copy.keySet().iterator(); - while(keyIter.hasNext()) { - Object key = keyIter.next(); - Object value = copy.get(key); - if(value instanceof Map) { - copy.put(key, constructFromMap((Map)value)); - } - } - - // Construct this node - PlanNodeImpl node = new PlanNodeImpl(copy); - - // Then construct children and connect - if(childMaps != null) { - for(int i=0; i<childMaps.size(); i++) { - Map childMap = (Map) childMaps.get(i); - PlanNodeImpl child = (PlanNodeImpl) constructFromMap(childMap); - child.setParent(node); - node.addChild(child); - } - } - - // And return - return node; - } - -}