David E. Jones
39484e52d2
A better approach for this condition, it isn't just the COUNT function we want to look for, it is ANY function; a reminder for those using this: put the unique field first
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918910 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 09:24:30 +00:00
David E. Jones
745e671051
Added back code similar to code before to use selected values in a count instead of ignoring them, which is necessary to get a distinct count when you are not selecting all fields/columns; now looks for the SQL generated with the function=count-distinct stuff is used so that it will function the old way and not include the column name at all, so hopefully that will take care of that problem while fixing the main bug of ignoring the selected fields set
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918903 13f79535-47bb-0310-9956-ffa450edef68
2010-03-04 09:03:46 +00:00
Adam Heath
7fc0f4cfdd
Remove a bunch of static variables, instead using an AtomicReference and
...
an instance of EntityConfigUtil to manage everything.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918734 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:15:01 +00:00
Adam Heath
ce2d761f51
Bad formatting, { shouldn't be on a line by itself.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918732 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:14:28 +00:00
Adam Heath
083663f6a4
Make use of FastMap's putIfAbsent, and remove an instance of
...
double-checked-locking.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918731 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:13:52 +00:00
Adam Heath
b2ca928774
Remove unnecessary cast when getting from genericDAOs cache.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918729 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:13:25 +00:00
Adam Heath
76b4cfb1ac
Make all the protected fields private and final.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@918725 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 22:11:35 +00:00
Scott Gray
ead84f88c3
Minor code cleanup: removed unnecessary cast and changed how a static field was being accessed
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916973 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:40:21 +00:00
Scott Gray
6607c6b903
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.transaction.TransactionUtil.rollback(boolean)
- Use TransactionUtil.rollback(boolean, String, Throwable) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916972 13f79535-47bb-0310-9956-ffa450edef68
2010-02-27 15:40:17 +00:00
David E. Jones
f67ff5da49
Changed to not try to do a distinct count by a specific column, which was introduced in rev 897605, as it seems to cause a number of problems and is a feature that probably isn't used much since it was introduced about a month ago; reintroducing this feature will require additional effort to resolve these
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916781 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 18:41:11 +00:00
Erwan de Ferrieres
88c91bd809
some comments were left in the previous commit (916646)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916649 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 11:23:00 +00:00
Erwan de Ferrieres
e2f65a76a3
Adding dependent-on on extend-entity (OFBIZ-3303)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916646 13f79535-47bb-0310-9956-ffa450edef68
2010-02-26 11:17:26 +00:00
Andrew Zeneski
aeebb6b841
commented out a debug statement I left in by mistake
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916456 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 21:01:19 +00:00
David E. Jones
20117fa1d8
Fixed bug in PrimaryKeyFinder where it wasn't passing through the timeZone and the locale for conversion; the underlying code does look for the timeZonea nd locale, but they weren't there because of the way the context was setup here
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916055 13f79535-47bb-0310-9956-ffa450edef68
2010-02-25 00:20:10 +00:00
Andrew Zeneski
77ca6da64d
extend-entity can now override the default-resource-name attribute
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@916049 13f79535-47bb-0310-9956-ffa450edef68
2010-02-24 23:59:58 +00:00
Scott Gray
21251f0907
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelIndex.getMainEntity()
- Use ModelIndex.getModelEntity() instead
org.ofbiz.entity.model.ModelIndex.setMainEntity(ModelEntity)
- Use one of the ModelIndex constructors instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912250 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:16:17 +00:00
Scott Gray
1d8fbd982e
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelEntity.getPk(int)
- Use ModelEntity.getPksIterator() instead
org.ofbiz.entity.model.ModelEntity.getNopk(int)
- Use ModelEntity.getNopksIterator() instead
org.ofbiz.entity.model.ModelEntity.getField(int)
- Use ModelEntity.getFieldsIterator() instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912249 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:10:09 +00:00
Scott Gray
318b7ae549
Reverting r912247, not all methods removed had been deprecated prior to 9.04
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912248 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 23:04:51 +00:00
Scott Gray
27ef95fa9c
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.model.ModelEntity.getPk(int)
- Use ModelEntity.getPksIterator() instead
org.ofbiz.entity.model.ModelEntity.getPksCopy()
- Use ModelEntity.getPkFieldsUnmodifiable() instead
org.ofbiz.entity.model.ModelEntity.getNopk(int)
- Use ModelEntity.getNopksIterator() instead
org.ofbiz.entity.model.ModelEntity.getField(int)
- Use ModelEntity.getFieldsIterator() instead
org.ofbiz.entity.model.ModelEntity.getFieldsCopy()
- Use ModelEntity.getFieldsUnmodifiable() instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912247 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:59:22 +00:00
Scott Gray
a4c34e4e34
Added missing code necessary to generate relation elements in ModelEntity.toXmlElement(...)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912246 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:22 +00:00
Scott Gray
5145912da8
- Added @SuppressWarnings("hiding") to field module (hides ModelInfo.module)
...
- Comment typo fix
- Removed a couple of unnecessary casts
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912245 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 22:53:18 +00:00
Scott Gray
b44d9fde91
Javadoc typo fix
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912227 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:15:06 +00:00
Scott Gray
5bfd3c432b
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityWhereString(String)
- Use EntityCondition.makeConditionWhere(String) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912226 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:15:00 +00:00
Scott Gray
114ea16f93
Removed unneccesary semicolons
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912225 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:09:28 +00:00
Scott Gray
51bcefa91d
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFunction.LENGTH(EntityConditionValue)
- Use EntityFunction.LENGTH(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LENGTH(Object)
- Use EntityFunction.LENGTH(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.TRIM(EntityConditionValue)
- Use EntityFunction.TRIM(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.TRIM(Object)
- Use EntityFunction.TRIM(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.UPPER(EntityConditionValue)
- Use EntityFunction.UPPER(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.UPPER(Object)
- Use EntityFunction.UPPER(Object) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LOWER(EntityConditionValue)
- Use EntityFunction.LOWER(EntityConditionValue) instead (method rather than constructor)
org.ofbiz.entity.condition.EntityFunction.LOWER(Object)
- Use EntityFunction.LOWER(Object) instead (method rather than constructor)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912224 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 21:09:23 +00:00
Scott Gray
a3e3df15af
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFieldValue(String)
- Use EntityFieldValue.makeFieldValue(String) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912221 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:50:49 +00:00
Scott Gray
e0563af6cd
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityFieldMap(EntityComparisonOperator<L, R>, EntityJoinOperator, V…)
- Use EntityCondition.makeCondition(EntityComparisonOperator<L, R>, EntityJoinOperator, Object…) instead
org.ofbiz.entity.condition.EntityFieldMap(Map<String,V>, EntityComparisonOperator<L, R>, EntityJoinOperator)
- Use EntityCondition.makeCondition(Map<String, ? extends Object>, EntityComparisonOperator<L, R>, EntityJoinOperator) instead
org.ofbiz.entity.condition.EntityFieldMap(EntityJoinOperator, Object...)
- Use EntityCondition.makeCondition(EntityJoinOperator, Object...) instead
org.ofbiz.entity.condition.EntityFieldMap(Map<String, ? extends Object>, EntityJoinOperator)
- Use EntityCondition.makeCondition(Map<String, ? extends Object>, EntityJoinOperator) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912220 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:47:27 +00:00
Scott Gray
ea65488869
Removed unneccesary deprecation warning suppression
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912212 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:19:35 +00:00
Scott Gray
0c3baeae57
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityExpr(L, EntityComparisonOperator<L,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
org.ofbiz.entity.condition.EntityExpr(String, EntityComparisonOperator<String,R>, R)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
org.ofbiz.entity.condition.EntityExpr(L, boolean, EntityComparisonOperator<L,R>, R, boolean)
- Use EntityCondition.makeCondition(L, EntityComparisonOperator<LL,RR>, R) instead
- Use EntityFunction.UPPER_FIELD(L) in place of leftUpper = true
- Use EntityFunction.UPPER(R) in place of rightUpper = true
org.ofbiz.entity.condition.EntityExpr(EntityCondition, EntityJoinOperator, EntityCondition)
- Use EntityCondition.makeCondition(EntityCondition, EntityJoinOperator, EntityCondition) instead
org.ofbiz.entity.condition.EntityExpr.setLUpper(boolean)
org.ofbiz.entity.condition.EntityExpr.isLUpper()
org.ofbiz.entity.condition.EntityExpr.isRUpper()
org.ofbiz.entity.condition.EntityExpr.setRUpper(boolean)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912211 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:19:30 +00:00
Scott Gray
60f6517b74
Organized imports
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912210 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 20:19:23 +00:00
Scott Gray
aa815051f5
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityDateFilterCondition(String, String)
- Use EntityCondition.makeConditionDate(String, String) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912203 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 19:54:33 +00:00
Scott Gray
fee56d9f59
The following deprecated classes, constructors or methods have been removed:
...
org.ofbiz.entity.condition.EntityConditionList(EntityJoinOperator, T…)
- Use EntityCondition.makeCondition(EntityJoinOperator, T…) instead
org.ofbiz.entity.condition.EntityConditionList(List<T>, EntityJoinOperator)
- Use EntityCondition.makeCondition(List<T>, EntityJoinOperator) instead
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912202 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 19:49:18 +00:00
Adrian Crum
e984c0afcf
Have XmlSerializer delegate object deserialization to XStream if the serialization method is not from XmlSerializer.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@912072 13f79535-47bb-0310-9956-ffa450edef68
2010-02-20 03:05:49 +00:00
Adrian Crum
583d012e4b
Created a SOAP serializer facade class to decouple SOAP code from XmlSerialize.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@910060 13f79535-47bb-0310-9956-ffa450edef68
2010-02-14 18:38:34 +00:00
Adrian Crum
7eb22acb3a
Test XStream serialization/deserialization of GenericValue.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@909858 13f79535-47bb-0310-9956-ffa450edef68
2010-02-13 17:45:11 +00:00
Adam Heath
e768559d39
Bother; these uses of FastMap are actually rather stupid. The map is
...
only populated once at startup, then never modified again. What I have
discovered is that, while FastMap is supposed to be more stable in
memory allocation and cpu utilization, there was one leg of it's
internal structure that was *extremely* unbalanced. Ie, consider a
binary tree with 128 nodes, with 7 top level nodes, and then all the
rest of the nodes are on one side of the tree. Since these maps are
never modified after startup, we might as well just use a HashMap here.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903802 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 19:52:27 +00:00
Adam Heath
041a20e96b
Similiar to the last commit, don't maintain back-links to view entities;
...
instead, just the names of the entities are stored.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903801 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 19:51:47 +00:00
Adam Heath
9a206397ca
Don't store references to connected ModelEntity; instead, just store the
...
entity name. This helps the connected object graph at runtime, as it
used to be view->entity->view->entity, in very long loops. This is one
part of the fix.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903800 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 19:51:03 +00:00
Adam Heath
52143c14c1
Fix case of DynamicViewEntity vivification into ModelViewEntity not
...
storing the ModelReader.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@903796 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 19:49:16 +00:00
Scott Gray
ea4c4c892e
Removed deprecated method ConnectionFactory.tryGenericConnectionSources(String, Element)
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@902226 13f79535-47bb-0310-9956-ffa450edef68
2010-01-22 19:11:18 +00:00
Scott Gray
5d8c3aa5f6
Fixed bug reported by Wickersheimer Jeremy, OFBIZ-3302. Because the testEntityListIterator test depends on the correct ordering of the find results, explicity specify the correct order rather than depending on the database to get it right.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@900511 13f79535-47bb-0310-9956-ffa450edef68
2010-01-18 18:53:50 +00:00
Scott Gray
89e146c0b2
Allow byte[] and ByteBuffer to be used to set a Blob typed GenericEntity fields without warnings
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899825 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:43:56 +00:00
Adam Heath
b17eb127ec
Fix trailing whitespace, and mixed tab/space at the beginning of lines.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@899812 13f79535-47bb-0310-9956-ffa450edef68
2010-01-15 21:00:23 +00:00
David E. Jones
9f222d3224
Small improvement to the EntityListIterator count total results code when distinct is used and partial fields are selected; note that this assumes the most unique field is first in the list since doing distinct on multiple fields in this way does not seem to work
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@897605 13f79535-47bb-0310-9956-ffa450edef68
2010-01-10 09:16:47 +00:00
David E. Jones
78f92eb5db
Small change to reduce the volume on this frequent error message that simply lets you know the system is falling back to a different way of doing things
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@896853 13f79535-47bb-0310-9956-ffa450edef68
2010-01-07 11:46:00 +00:00
Bilgin Ismet Ibryam
6b0a2fe97f
Use getLocalName() instead of getNodeName() and getTagName() methods. This change will fix errors in soap call, where elements have namespace prefixes.
...
I didn't notice any error caused from these changes, but it would be great if someone with more xml knowledge takes a loot at it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894359 13f79535-47bb-0310-9956-ffa450edef68
2009-12-29 11:33:39 +00:00
Adam Heath
93cc17b5b0
Remove a bunch of wildcard imports.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894106 13f79535-47bb-0310-9956-ffa450edef68
2009-12-27 19:54:58 +00:00
Adam Heath
17e8d26105
Fix some javadoc warnings.
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@894037 13f79535-47bb-0310-9956-ffa450edef68
2009-12-27 01:01:01 +00:00
Adam Heath
68278753f9
Pass the list of values to ModelConversion.convert().
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@893345 13f79535-47bb-0310-9956-ffa450edef68
2009-12-22 23:17:56 +00:00
Adam Heath
4693797bc2
Remove plurality in ModelConversion.convert().
...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@893344 13f79535-47bb-0310-9956-ffa450edef68
2009-12-22 23:17:13 +00:00