Added DAOs. Attribute query objects seem to be able to generate hibernate predicates.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5467 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2007-04-09 16:06:01 +00:00
parent 838b2bfcd3
commit 32d1493301
25 changed files with 975 additions and 215 deletions

View File

@@ -0,0 +1,72 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.service.cmr.attributes.AttrQueryHelper;
/**
* Implementation of query helper for building predicates.
* @author britt
*/
public class AttrQueryHelperImpl implements AttrQueryHelper
{
private int fSuffix;
private Map<String, String> fParameters;
public AttrQueryHelperImpl()
{
fSuffix = 0;
fParameters = new HashMap<String, String>();
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.attributes.AttrQueryHelper#getNextSuffix()
*/
public int getNextSuffix()
{
return fSuffix++;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.attributes.AttrQueryHelper#getParameters()
*/
public Map<String, String> getParameters()
{
return fParameters;
}
/* (non-Javadoc)
* @see org.alfresco.service.cmr.attributes.AttrQueryHelper#setParameter(java.lang.String, java.lang.String)
*/
public void setParameter(String name, String value)
{
fParameters.put(name, value);
}
}

View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes;
import org.alfresco.service.cmr.attributes.AttrAndQuery;
import org.alfresco.service.cmr.attributes.AttrNotQuery;
import org.alfresco.service.cmr.attributes.AttrOrQuery;
import org.alfresco.service.cmr.attributes.AttrQuery;
import org.alfresco.service.cmr.attributes.AttrQueryGT;
import org.alfresco.service.cmr.attributes.AttrQueryHelper;
import org.alfresco.service.cmr.attributes.AttrQueryLT;
import org.alfresco.service.cmr.attributes.AttrQueryLike;
import junit.framework.TestCase;
/**
* Tests of AttrQueries.
* @author britt
*/
public class AttrQueryTest extends TestCase
{
private AttrQueryHelper fHelper;
/* (non-Javadoc)
* @see junit.framework.TestCase#setUp()
*/
@Override
protected void setUp() throws Exception
{
fHelper = new AttrQueryHelperImpl();
}
/**
* Do all the testing in one.
*/
public void testAll()
{
AttrQuery query =
new AttrOrQuery(
new AttrAndQuery(new AttrQueryGT("cat"), new AttrQueryLT("hat")),
new AttrNotQuery(new AttrQueryLike("fur%")));
String predicate = query.getPredicate(fHelper);
System.out.println(predicate);
System.out.println(fHelper.getParameters());
assertEquals("((me.key > :name0 and me.key < :name1) or (not me.key like :name2))",
predicate);
assertEquals("cat", fHelper.getParameters().get(":name0"));
assertEquals("hat", fHelper.getParameters().get(":name1"));
assertEquals("fur%", fHelper.getParameters().get(":name2"));
}
}

View File

@@ -31,5 +31,13 @@ package org.alfresco.repo.attributes;
*/
public interface GlobalAttributeEntry
{
// TODO This is a stub and needs to be completed.
/**
* Get the name of the entry.
*/
public String getName();
/**
* Get the Attribute.
*/
public Attribute getAttribute();
}

View File

@@ -0,0 +1,75 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes;
/**
* @author britt
*
*/
public class GlobalAttributeEntryImpl implements GlobalAttributeEntry
{
private String fName;
private Attribute fAttribute;
public GlobalAttributeEntryImpl(String name, Attribute attr)
{
fName = name;
fAttribute = attr;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntry#getAttribute()
*/
public Attribute getAttribute()
{
return fAttribute;
}
/**
* Setter.
*/
public void setAttribute(Attribute attr)
{
fAttribute = attr;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntry#getName()
*/
public String getName()
{
return fName;
}
/**
* Setter.
*/
public void setName(String name)
{
fName = name;
}
}

View File

@@ -25,10 +25,17 @@
package org.alfresco.repo.attributes;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
import org.alfresco.repo.avm.AVMDAOs;
/**
* @author britt
*
@@ -53,8 +60,7 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public void clear()
{
// TODO Auto-generated method stub
super.clear();
AVMDAOs.Instance().fMapEntryDAO.delete(this);
}
/* (non-Javadoc)
@@ -63,8 +69,13 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public Set<Entry<String, Attribute>> entrySet()
{
// TODO Auto-generated method stub
return super.entrySet();
List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
Map<String, Attribute> map = new HashMap<String, Attribute>();
for (MapEntry entry : entries)
{
map.put(entry.getKey(), entry.getAttribute());
}
return map.entrySet();
}
/* (non-Javadoc)
@@ -73,8 +84,7 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public Attribute get(String key)
{
// TODO Auto-generated method stub
return super.get(key);
return AVMDAOs.Instance().fMapEntryDAO.get(this, key).getAttribute();
}
/* (non-Javadoc)
@@ -83,8 +93,13 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public Set<String> keySet()
{
// TODO Auto-generated method stub
return super.keySet();
List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
Set<String> keys = new HashSet<String>();
for (MapEntry entry : entries)
{
keys.add(entry.getKey());
}
return keys;
}
/* (non-Javadoc)
@@ -93,8 +108,8 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public void put(String key, Attribute value)
{
// TODO Auto-generated method stub
super.put(key, value);
MapEntry entry = new MapEntryImpl(this, key, value);
AVMDAOs.Instance().fMapEntryDAO.save(entry);
}
/* (non-Javadoc)
@@ -103,8 +118,11 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public void remove(String key)
{
// TODO Auto-generated method stub
super.remove(key);
MapEntry entry = AVMDAOs.Instance().fMapEntryDAO.get(this, key);
if (entry != null)
{
AVMDAOs.Instance().fMapEntryDAO.delete(entry);
}
}
/* (non-Javadoc)
@@ -113,7 +131,12 @@ public class MapAttributeImpl extends AttributeImpl implements MapAttribute
@Override
public Collection<Attribute> values()
{
// TODO Auto-generated method stub
return super.values();
List<MapEntry> entries = AVMDAOs.Instance().fMapEntryDAO.get(this);
List<Attribute> attrs = new ArrayList<Attribute>();
for (MapEntry entry : entries)
{
attrs.add(entry.getAttribute());
}
return attrs;
}
}

View File

@@ -31,5 +31,27 @@ package org.alfresco.repo.attributes;
*/
public interface MapEntry
{
// TODO This is a stub. Fix it.
/**
* Get the primary key.
* @return The key.
*/
public long getId();
/**
* Get the map attribute that this entry belongs to.
* @return The map attribute.
*/
public MapAttribute getMap();
/**
* Get the lookup key for this entry.
* @return The key.
*/
public String getKey();
/**
* Get the value attribute.
* @return The value attribute.
*/
public Attribute getAttribute();
}

View File

@@ -0,0 +1,115 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes;
/**
* Implementation of map entries.
* @author britt
*/
public class MapEntryImpl implements MapEntry
{
private long fID;
private MapAttribute fMap;
private String fKey;
private Attribute fAttribute;
public MapEntryImpl(MapAttribute map,
String key,
Attribute attribute)
{
fMap = map;
fKey = key;
fAttribute = attribute;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntry#getAttribute()
*/
public Attribute getAttribute()
{
return fAttribute;
}
/**
* Set the attribute.
* @param attr The attribute.
*/
public void setAttribute(Attribute attr)
{
fAttribute = attr;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntry#getId()
*/
public long getId()
{
return fID;
}
/**
* Setter.
*/
public void setId(long id)
{
fID = id;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntry#getKey()
*/
public String getKey()
{
return fKey;
}
/**
* Setter.
*/
public void setKey(String key)
{
fKey = key;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntry#getMap()
*/
public MapAttribute getMap()
{
return fMap;
}
/**
* Setter.
*/
public void setMap(MapAttribute map)
{
fMap = map;
}
}

View File

@@ -0,0 +1,66 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes.hibernate;
import java.util.List;
import org.alfresco.repo.attributes.Attribute;
import org.alfresco.repo.attributes.AttributeDAO;
import org.alfresco.service.cmr.attributes.AttrQuery;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* Hibernate implementation of persistence for Attributes.
* @author britt
*/
public class AttributeDAOHibernate extends HibernateDaoSupport implements
AttributeDAO
{
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.AttributeDAO#delete(org.alfresco.repo.attributes.Attribute)
*/
public void delete(Attribute attr)
{
getSession().delete(attr);
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.AttributeDAO#find(java.lang.String, org.alfresco.service.cmr.attributes.AttrQuery)
*/
public List<Attribute> find(String path, AttrQuery query)
{
// TODO Need to implement query processing.
return null;
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.AttributeDAO#save(org.alfresco.repo.attributes.Attribute)
*/
public void save(Attribute attr)
{
getSession().save(attr);
}
}

View File

@@ -86,6 +86,6 @@
<many-to-one class="MapAttributeImpl" name="map" column="map_id"/>
<property name="key" type="string" length="160" column="key" index="map_key_index"/>
</natural-id>
<many-to-one class="AttributeImpl" name="attribute" columne="attribute_id"/>
<many-to-one class="AttributeImpl" name="attribute" column="attribute_id"/>
</class>
</hibernate-mapping>

View File

@@ -0,0 +1,74 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes.hibernate;
import org.alfresco.repo.attributes.Attribute;
import org.alfresco.repo.attributes.GlobalAttributeEntry;
import org.alfresco.repo.attributes.GlobalAttributeEntryDAO;
import org.alfresco.repo.attributes.GlobalAttributeEntryImpl;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* Hibernate implementation of Global Attribute Entries.
* @author britt
*/
public class GlobalAttributeEntryDAOHibernate extends HibernateDaoSupport
implements GlobalAttributeEntryDAO
{
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#delete(org.alfresco.repo.attributes.GlobalAttributeEntry)
*/
public void delete(GlobalAttributeEntry entry)
{
getSession().delete(entry);
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#delete(java.lang.String)
*/
public void delete(String name)
{
delete((GlobalAttributeEntry)getSession().get(GlobalAttributeEntryImpl.class, name));
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#get(java.lang.String)
*/
public Attribute get(String name)
{
GlobalAttributeEntry entry =
(GlobalAttributeEntry)getSession().get(GlobalAttributeEntryImpl.class, name);
return entry.getAttribute();
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.GlobalAttributeEntryDAO#save(org.alfresco.repo.attributes.GlobalAttributeEntry)
*/
public void save(GlobalAttributeEntry entry)
{
getSession().save(entry);
}
}

View File

@@ -0,0 +1,90 @@
/*
* Copyright (C) 2005-2007 Alfresco Software Limited.
*
* This program 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
* of the License, or (at your option) any later version.
* This program 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 this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing
*/
package org.alfresco.repo.attributes.hibernate;
import java.util.List;
import org.alfresco.repo.attributes.MapAttribute;
import org.alfresco.repo.attributes.MapEntry;
import org.alfresco.repo.attributes.MapEntryDAO;
import org.hibernate.Query;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
/**
* Hibernate implementation of persistence for MapEntries.
* @author britt
*/
public class MapEntryDAOHibernate extends HibernateDaoSupport implements
MapEntryDAO
{
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntryDAO#delete(org.alfresco.repo.attributes.MapEntry)
*/
public void delete(MapEntry entry)
{
getSession().delete(entry);
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntryDAO#delete(org.alfresco.repo.attributes.MapAttribute)
*/
public void delete(MapAttribute mapAttr)
{
Query query = getSession().createQuery("delete from MapEntryImpl me where me.map = :map");
query.setEntity("map", mapAttr);
query.executeUpdate();
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntryDAO#get(org.alfresco.repo.attributes.MapAttribute, java.lang.String)
*/
public MapEntry get(MapAttribute mapAttr, String key)
{
Query query = getSession().createQuery("from MapEntryImpl me where me.map = :map and me.key = :key");
query.setEntity("map", mapAttr);
query.setParameter("key", key);
return (MapEntry)query.uniqueResult();
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntryDAO#get(org.alfresco.repo.attributes.MapAttribute)
*/
@SuppressWarnings("unchecked")
public List<MapEntry> get(MapAttribute mapAttr)
{
Query query = getSession().createQuery("from MapEntryImpl me where me.map = :map");
query.setEntity("map", mapAttr);
return (List<MapEntry>)query.list();
}
/* (non-Javadoc)
* @see org.alfresco.repo.attributes.MapEntryDAO#save(org.alfresco.repo.attributes.MapEntry)
*/
public void save(MapEntry entry)
{
getSession().save(entry);
}
}