Menu
▾
▴
andromdaplugins-cvs
|
From: Vance K. <va...@us...> - 2006-01-03 01:38:10
|
User: vancek
Date: 06/01/02 17:38:02
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
refactored getAttributesAsList method from utils to here
Revision Changes Path
1.2 +39 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -r1.1 -r1.2
--- EJB3EntityFacadeLogicImpl.java 28 Dec 2005 00:32:55 -0000 1.1
+++ EJB3EntityFacadeLogicImpl.java 3 Jan 2006 01:38:01 -0000 1.2
@@ -239,7 +239,8 @@
*/
protected java.lang.String handleGetViewType()
{
- return EJB3MetafacadeUtils.getViewType(this);
+ return EJB3MetafacadeUtils.getViewType(this,
+ String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_VIEW_TYPE)));
}
/**
@@ -835,4 +836,41 @@
// Must the root class - Cannot have embeddable superclass in the middle of the hierarchy
return isEmbeddableSuperclass && isRoot();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleGetAttributesAsList(java.util.Collection, boolean, boolean)
+ */
+ protected String handleGetAttributesAsList(Collection attributes, boolean includeTypes, boolean includeNames)
+ {
+ if (!includeNames && !includeTypes || attributes == null)
+ {
+ return "";
+ }
+
+ StringBuffer sb = new StringBuffer();
+ String separator = "";
+
+ for (final Iterator it = attributes.iterator(); it.hasNext();)
+ {
+ //AttributeFacade attr = (AttributeFacade)it.next();
+ EJB3EntityAttributeFacade attr = (EJB3EntityAttributeFacade)it.next();
+ if (!attr.isVersion())
+ {
+ sb.append(separator);
+ separator = ", ";
+ if (includeTypes)
+ {
+ sb.append(attr.getType().getFullyQualifiedName());
+ sb.append(" ");
+ }
+ if (includeNames)
+ {
+ sb.append(attr.getName());
+ }
+ }
+
+ }
+ return sb.toString();
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-17 04:08:22
|
User: vancek
Date: 06/01/16 20:08:12
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added entity generic finders support
Revision Changes Path
1.4 +23 -5 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- EJB3EntityFacadeLogicImpl.java 6 Jan 2006 13:56:17 -0000 1.3
+++ EJB3EntityFacadeLogicImpl.java 17 Jan 2006 04:08:12 -0000 1.4
@@ -50,12 +50,14 @@
private static final String ENTITY_INHERITANCE_STRATEGY = "entityInheritanceStrategy";
/**
- * Stores the default entity discriminator type used in the inheritance annotation
+ * Stores the default entity discriminator type used in the
+ * inheritance annotation
*/
private static final String ENTITY_DISCRIMINATOR_TYPE = "entityDiscriminatorType";
/**
- * Stores the default entity discriminator column name used in the DiscriminatorColumn annotation
+ * Stores the default entity discriminator column name used in
+ * the DiscriminatorColumn annotation
*/
private static final String ENTITY_DISCRIMINATOR_COLUMN_NAME = "entityDiscriminatorColumnName";
@@ -119,20 +121,28 @@
public static final String ENTITY_NAME_PATTERN = "entityNamePattern";
/**
- * The property which stores the pattern defining the entity implementation name.
+ * The property which stores the pattern defining the entity
+ * implementation name.
*/
public static final String ENTITY_IMPLEMENTATION_NAME_PATTERN = "entityImplementationNamePattern";
/**
- * The property that stores the pattern defining the entity listener class name.
+ * The property that stores the pattern defining the entity
+ * listener class name.
*/
public static final String ENTITY_LISTENER_NAME_PATTERN = "entityListenerNamePattern";
/**
- * The property that stores the pattern defining the entity embeddable super class name.
+ * The property that stores the pattern defining the entity
+ * embeddable super class name.
*/
public static final String ENTITY_EMBEDDABLE_NAME_PATTERN = "entityEmbeddableNamePattern";
+ /**
+ * The p0roperty that stores the generic finders option
+ */
+ private static final String ENTITY_GENERIC_FINDERS = "entityGenericFinders";
+
// ---------------- constructor -------------------------------
public EJB3EntityFacadeLogicImpl (Object metaObject, String context)
@@ -859,4 +869,12 @@
}
return sb.toString();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsGenericFinders()
+ */
+ protected boolean handleIsGenericFinders()
+ {
+ return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(ENTITY_GENERIC_FINDERS)));
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-18 09:21:45
|
User: vancek
Date: 06/01/18 01:21:39
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added isCompositePrimaryKeyPresent, added getEntityCompositePrimaryKeyName, added getFullyQualifiedEntityCompositePrimaryKeyName, updated getAttributesAsList with extra arg (includeCompPKAttr) to filter identifier attributes of entity bean with composite primary key
Revision Changes Path
1.5 +59 -4 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -r1.4 -r1.5
--- EJB3EntityFacadeLogicImpl.java 17 Jan 2006 04:08:12 -0000 1.4
+++ EJB3EntityFacadeLogicImpl.java 18 Jan 2006 09:21:39 -0000 1.5
@@ -139,7 +139,13 @@
public static final String ENTITY_EMBEDDABLE_NAME_PATTERN = "entityEmbeddableNamePattern";
/**
- * The p0roperty that stores the generic finders option
+ * The property that stores the pattern defining the entity
+ * composite primary key class name.
+ */
+ private static final String ENTITY_COMPOSITE_PRIMARY_KEY_NAME_PATTERN = "entityCompositePrimaryKeyNamePattern";
+
+ /**
+ * The poroperty that stores the generic finders option
*/
private static final String ENTITY_GENERIC_FINDERS = "entityGenericFinders";
@@ -152,6 +158,9 @@
// --------------- methods ---------------------
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade#getIdentifiers()
+ */
public Collection handleGetIdentifiers()
{
Collection identifiers = new ArrayList();
@@ -509,6 +518,19 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetEntityCompositePrimaryKeyName()
+ */
+ protected String handleGetEntityCompositePrimaryKeyName()
+ {
+ String compPKPattern =
+ String.valueOf(this.getConfiguredProperty(ENTITY_COMPOSITE_PRIMARY_KEY_NAME_PATTERN));
+
+ return MessageFormat.format(
+ compPKPattern,
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
* @see org.andromda.metafacades.uml.EntityFacade#getEntityListenerName()
*/
protected String handleGetEntityListenerName()
@@ -546,6 +568,17 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedEntityCompositePrimaryKeyName()
+ */
+ protected String handleGetFullyQualifiedEntityCompositePrimaryKeyName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getEntityCompositePrimaryKeyName(),
+ null);
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetEntityImplementationName()
*/
protected String handleGetEntityImplementationName()
@@ -837,7 +870,11 @@
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
* handleGetAttributesAsList(java.util.Collection, boolean, boolean)
*/
- protected String handleGetAttributesAsList(Collection attributes, boolean includeTypes, boolean includeNames)
+ protected String handleGetAttributesAsList(
+ Collection attributes,
+ boolean includeTypes,
+ boolean includeNames,
+ boolean includeCompPKAttr)
{
if (!includeNames && !includeTypes || attributes == null)
{
@@ -849,9 +886,14 @@
for (final Iterator it = attributes.iterator(); it.hasNext();)
{
- //AttributeFacade attr = (AttributeFacade)it.next();
EJB3EntityAttributeFacade attr = (EJB3EntityAttributeFacade)it.next();
- if (!attr.isVersion())
+ /**
+ * Do not include attributes that are assigned for optimistic lock value for version or
+ * identifier attributes for entities with a composite primary key .
+ */
+ boolean isCompositePK = this.isCompositePrimaryKeyPresent();
+ if (!attr.isVersion() &&
+ ((isCompositePK && (!attr.isIdentifier() || includeCompPKAttr)) || !isCompositePK))
{
sb.append(separator);
separator = ", ";
@@ -877,4 +919,17 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(ENTITY_GENERIC_FINDERS)));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsCompositePrimaryKeyPresent()
+ */
+ protected boolean handleIsCompositePrimaryKeyPresent()
+ {
+ boolean isCompositePK = false;
+ if (this.getIdentifiers().size() > 1)
+ {
+ isCompositePK = true;
+ }
+ return isCompositePK;
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-01-20 17:20:07
|
User: vancek
Date: 06/01/20 09:19:59
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
requiresGeneralizationMapping no longer checks for super entity not being an embeddable superclass. added embeddableSuperclassGeneralizationExists to check for super entity being an ebeddable superclass.
Revision Changes Path
1.6 +12 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -r1.5 -r1.6
--- EJB3EntityFacadeLogicImpl.java 18 Jan 2006 09:21:39 -0000 1.5
+++ EJB3EntityFacadeLogicImpl.java 20 Jan 2006 17:19:58 -0000 1.6
@@ -832,7 +832,10 @@
*/
protected boolean handleIsRequiresGeneralizationMapping()
{
- return (this.getSuperEntity() != null && !this.getSuperEntity().isEmbeddableSuperclass());
+ return (this.getSuperEntity() != null &&
+ (this.getSuperEntity().isInheritanceSingleTable() ||
+ this.getSuperEntity().isInheritanceTablePerClass() ||
+ this.getSuperEntity().isInheritanceJoined()));
}
/**
@@ -867,6 +870,14 @@
}
/**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclassGeneralizationExists()
+ */
+ protected boolean handleIsEmbeddableSuperclassGeneralizationExists()
+ {
+ return (this.getSuperEntity() != null && this.getSuperEntity().isEmbeddableSuperclass());
+ }
+
+ /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
* handleGetAttributesAsList(java.util.Collection, boolean, boolean)
*/
|
|
From: Vance K. <va...@us...> - 2006-01-23 05:53:40
|
User: vancek
Date: 06/01/22 21:53:32
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
updated getAttributesAsList to filter identifiers with auto generator types
Revision Changes Path
1.7 +29 -18 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -r1.6 -r1.7
--- EJB3EntityFacadeLogicImpl.java 20 Jan 2006 17:19:58 -0000 1.6
+++ EJB3EntityFacadeLogicImpl.java 23 Jan 2006 05:53:32 -0000 1.7
@@ -568,7 +568,8 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedEntityCompositePrimaryKeyName()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleGetFullyQualifiedEntityCompositePrimaryKeyName()
*/
protected String handleGetFullyQualifiedEntityCompositePrimaryKeyName()
{
@@ -870,7 +871,8 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclassGeneralizationExists()
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleIsEmbeddableSuperclassGeneralizationExists()
*/
protected boolean handleIsEmbeddableSuperclassGeneralizationExists()
{
@@ -879,13 +881,13 @@
/**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
- * handleGetAttributesAsList(java.util.Collection, boolean, boolean)
+ * handleGetAttributesAsList(java.util.Collection, boolean, boolean, boolean)
*/
protected String handleGetAttributesAsList(
Collection attributes,
boolean includeTypes,
boolean includeNames,
- boolean includeCompPKAttr)
+ boolean includeAutoIdentifiers)
{
if (!includeNames && !includeTypes || attributes == null)
{
@@ -899,12 +901,20 @@
{
EJB3EntityAttributeFacade attr = (EJB3EntityAttributeFacade)it.next();
/**
- * Do not include attributes that are assigned for optimistic lock value for version or
- * identifier attributes for entities with a composite primary key .
+ * Do not include attributes that are assigned for optimistic lock value as a version
+ */
+ boolean isCompositePKPresent = this.isCompositePrimaryKeyPresent();
+ if (!attr.isVersion())
+ {
+ /**
+ * Do not include identifier attributes for entities with a composite primary key
+ * or if includeAutoIdentifiers is false, do not include identifiers with auto generated values.
*/
- boolean isCompositePK = this.isCompositePrimaryKeyPresent();
- if (!attr.isVersion() &&
- ((isCompositePK && (!attr.isIdentifier() || includeCompPKAttr)) || !isCompositePK))
+ if ((isCompositePKPresent && (includeAutoIdentifiers || !attr.isIdentifier())) ||
+ (!isCompositePKPresent &&
+ ((!includeAutoIdentifiers && attr.isIdentifier() && attr.isGeneratorTypeNone()) ||
+ (includeAutoIdentifiers && attr.isIdentifier()) ||
+ !attr.isIdentifier())))
{
sb.append(separator);
separator = ", ";
@@ -918,6 +928,7 @@
sb.append(attr.getName());
}
}
+ }
}
return sb.toString();
|
|
From: Vance K. <va...@us...> - 2006-01-25 03:00:43
|
User: vancek
Date: 06/01/24 19:00:38
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
moved ENTITY_DEFAULT_VIEW_TYPE from EJB3Globals to here
Revision Changes Path
1.8 +6 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- EJB3EntityFacadeLogicImpl.java 23 Jan 2006 05:53:32 -0000 1.7
+++ EJB3EntityFacadeLogicImpl.java 25 Jan 2006 03:00:37 -0000 1.8
@@ -62,6 +62,11 @@
private static final String ENTITY_DISCRIMINATOR_COLUMN_NAME = "entityDiscriminatorColumnName";
/**
+ * The default view type accessability for an entity POJO bean
+ */
+ public static final String ENTITY_DEFAULT_VIEW_TYPE = "entityViewType";
+
+ /**
* Value for one table per root class
*/
private static final String INHERITANCE_STRATEGY_TABLE_PER_CLASS = "TABLE_PER_CLASS";
@@ -259,7 +264,7 @@
protected java.lang.String handleGetViewType()
{
return EJB3MetafacadeUtils.getViewType(this,
- String.valueOf(this.getConfiguredProperty(EJB3Globals.ENTITY_DEFAULT_VIEW_TYPE)));
+ String.valueOf(this.getConfiguredProperty(ENTITY_DEFAULT_VIEW_TYPE)));
}
/**
|
|
From: Vance K. <va...@us...> - 2006-01-31 15:26:10
|
User: vancek
Date: 06/01/31 07:26:02
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added isFinderFindAllExists and isFinderFindByPrimaryKeyExists
Revision Changes Path
1.10 +42 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- EJB3EntityFacadeLogicImpl.java 29 Jan 2006 01:55:58 -0000 1.9
+++ EJB3EntityFacadeLogicImpl.java 31 Jan 2006 15:26:01 -0000 1.10
@@ -17,6 +17,7 @@
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.MetafacadeUtils;
import org.andromda.metafacades.uml.OperationFacade;
+import org.andromda.metafacades.uml.ParameterFacade;
import org.andromda.metafacades.uml.TypeMappings;
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
import org.apache.commons.collections.CollectionUtils;
@@ -967,4 +968,45 @@
{
return this.hasStereotype(EJB3Profile.STEREOTYPE_LISTENER);
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsFinderFindAllExists()
+ */
+ protected boolean handleIsFinderFindAllExists()
+ {
+ boolean finderExists = false;
+ for (final Iterator iter = this.getQueryOperations().iterator(); iter.hasNext();)
+ {
+ final OperationFacade operation = (OperationFacade)iter.next();
+ if (operation.getName().equalsIgnoreCase("findAll"))
+ {
+ // Check for no finder arguments
+ final Collection parameters = operation.getParameters();
+ if (parameters.size() == 0)
+ {
+ finderExists = true;
+ break;
+ }
+ }
+ }
+ return finderExists;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsFinderFindByPrimaryKeyExists()
+ */
+ protected boolean handleIsFinderFindByPrimaryKeyExists()
+ {
+ boolean finderExists = false;
+ for (final Iterator iter = this.getQueryOperations().iterator(); iter.hasNext();)
+ {
+ final OperationFacade operation = (OperationFacade)iter.next();
+ if (operation.getName().equalsIgnoreCase("findByPrimaryKey"))
+ {
+ finderExists = true;
+ break;
+ }
+ }
+ return finderExists;
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-02-01 08:42:31
|
User: vancek
Date: 06/02/01 00:42:26
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
fixed isFinderFindAllExists to detec findAll finder without args
Revision Changes Path
1.11 +2 -3 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- EJB3EntityFacadeLogicImpl.java 31 Jan 2006 15:26:01 -0000 1.10
+++ EJB3EntityFacadeLogicImpl.java 1 Feb 2006 08:42:26 -0000 1.11
@@ -978,11 +978,10 @@
for (final Iterator iter = this.getQueryOperations().iterator(); iter.hasNext();)
{
final OperationFacade operation = (OperationFacade)iter.next();
- if (operation.getName().equalsIgnoreCase("findAll"))
+ if (StringUtils.trimToEmpty(operation.getName()).equalsIgnoreCase("findAll"))
{
// Check for no finder arguments
- final Collection parameters = operation.getParameters();
- if (parameters.size() == 0)
+ if (operation.getArguments().size() == 0)
{
finderExists = true;
break;
|
|
From: Vance K. <va...@us...> - 2006-02-06 04:03:31
|
User: vancek
Date: 06/02/05 20:03:25
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
removed ENTITY_ACCESS_TYPE static
removed getAccessType method
Revision Changes Path
1.12 +0 -18 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- EJB3EntityFacadeLogicImpl.java 1 Feb 2006 08:42:26 -0000 1.11
+++ EJB3EntityFacadeLogicImpl.java 6 Feb 2006 04:03:25 -0000 1.12
@@ -36,11 +36,6 @@
extends EJB3EntityFacadeLogic
{
/**
- * The default entity access type
- */
- public static final String ENTITY_ACCESS_TYPE = "entityAccessType";
-
- /**
* The default entity association cascade property
*/
public static final String ENTITY_DEFAULT_CASCADE = "entityDefaultCascade";
@@ -846,19 +841,6 @@
}
/**
- * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetAccessType()
- */
- protected String handleGetAccessType()
- {
- String accessType = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_ACCESS_TYPE);
- if (StringUtils.isBlank(accessType))
- {
- accessType = String.valueOf(this.getConfiguredProperty(ENTITY_ACCESS_TYPE));
- }
- return accessType;
- }
-
- /**
* @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEmbeddableSuperclass()
*/
protected boolean handleIsEmbeddableSuperclass()
|
|
From: Vance K. <va...@us...> - 2006-02-08 10:16:26
|
User: vancek
Date: 06/02/08 02:16:21
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
isEmbeddableSuperclass now checks for MappedSuperclass stereotype rather than tagged value
Revision Changes Path
1.13 +5 -10 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -w -r1.12 -r1.13
--- EJB3EntityFacadeLogicImpl.java 6 Feb 2006 04:03:25 -0000 1.12
+++ EJB3EntityFacadeLogicImpl.java 8 Feb 2006 10:16:20 -0000 1.13
@@ -845,16 +845,11 @@
*/
protected boolean handleIsEmbeddableSuperclass()
{
- boolean isEmbeddableSuperclass = false;
- String isEmbeddableSuperclassStr =
- (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_EMBEDDABLE_SUPERCLASS);
+ boolean isEmbeddableSuperclass = this.hasStereotype(EJB3Profile.STEREOTYPE_MAPPED_SUPERCLASS);
- if (StringUtils.isNotBlank(isEmbeddableSuperclassStr))
- {
- isEmbeddableSuperclass = BooleanUtils.toBoolean(isEmbeddableSuperclassStr);
- }
-
- // Must the root class - Cannot have embeddable superclass in the middle of the hierarchy
+ /**
+ * Must the root class - Cannot have embeddable superclass in the middle of the hierarchy
+ */
return isEmbeddableSuperclass && isRoot();
}
|
|
From: Vance K. <va...@us...> - 2006-02-20 05:20:26
|
User: vancek
Date: 06/02/19 21:20:22
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
implemented isManageable, getManageableDisplayAttribute and getIdentifier
Revision Changes Path
1.14 +57 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -w -r1.13 -r1.14
--- EJB3EntityFacadeLogicImpl.java 8 Feb 2006 10:16:20 -0000 1.13
+++ EJB3EntityFacadeLogicImpl.java 20 Feb 2006 05:20:22 -0000 1.14
@@ -15,11 +15,12 @@
import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ClassifierFacade;
import org.andromda.metafacades.uml.DependencyFacade;
+import org.andromda.metafacades.uml.EntityAttribute;
import org.andromda.metafacades.uml.MetafacadeUtils;
import org.andromda.metafacades.uml.OperationFacade;
-import org.andromda.metafacades.uml.ParameterFacade;
import org.andromda.metafacades.uml.TypeMappings;
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
+import org.andromda.metafacades.uml.UMLProfile;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.BooleanUtils;
@@ -985,4 +986,59 @@
}
return finderExists;
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsManageable()
+ */
+ protected boolean handleIsManageable()
+ {
+ return this.hasStereotype(EJB3Profile.STEREOTYPE_MANAGEABLE);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetManageableDisplayAttribute()
+ */
+ protected Object handleGetManageableDisplayAttribute()
+ {
+ AttributeFacade displayAttribute = null;
+
+ final Object taggedValueObject = this.findTaggedValue(UMLProfile.TAGGEDVALUE_MANAGEABLE_DISPLAY_NAME);
+ if (taggedValueObject != null)
+ {
+ displayAttribute = this.findAttribute(StringUtils.trimToEmpty(taggedValueObject.toString()));
+ }
+
+ final Collection attributes = this.getAttributes(true);
+ for (final Iterator attributeIterator = attributes.iterator();
+ attributeIterator.hasNext() && displayAttribute == null;)
+ {
+ final EntityAttribute attribute = (EntityAttribute)attributeIterator.next();
+ if (attribute.isUnique())
+ {
+ displayAttribute = attribute;
+ }
+ }
+
+ if (displayAttribute == null)
+ {
+ if (!getIdentifiers().isEmpty())
+ {
+ displayAttribute = (EntityAttribute)this.getIdentifiers().iterator().next();
+ }
+ else if (!attributes.isEmpty())
+ {
+ displayAttribute = (EntityAttribute)attributes.iterator().next();
+ }
+ }
+
+ return displayAttribute;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetIdentifer()
+ */
+ protected Object handleGetIdentifer()
+ {
+ return (EJB3EntityAttributeFacade)this.getIdentifiers().iterator().next();
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-03-14 06:23:04
|
User: vancek
Date: 06/03/13 22:23:03
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
implemented getCacheType and isCacheEnabled
Revision Changes Path
1.15 +32 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -w -r1.14 -r1.15
--- EJB3EntityFacadeLogicImpl.java 20 Feb 2006 05:20:22 -0000 1.14
+++ EJB3EntityFacadeLogicImpl.java 14 Mar 2006 06:23:03 -0000 1.15
@@ -147,10 +147,20 @@
private static final String ENTITY_COMPOSITE_PRIMARY_KEY_NAME_PATTERN = "entityCompositePrimaryKeyNamePattern";
/**
- * The poroperty that stores the generic finders option
+ * The property that stores the generic finders option
*/
private static final String ENTITY_GENERIC_FINDERS = "entityGenericFinders";
+ /**
+ * The property that stores whether caching is enabled.
+ */
+ private static final String HIBERNATE_ENABLE_CACHE = "hibernateEnableCache";
+
+ /**
+ * The property that stores the hibernate entity cache value.
+ */
+ private static final String HIBERNATE_ENTITY_CACHE = "hibernateEntityCache";
+
// ---------------- constructor -------------------------------
public EJB3EntityFacadeLogicImpl (Object metaObject, String context)
@@ -1041,4 +1051,25 @@
{
return (EJB3EntityAttributeFacade)this.getIdentifiers().iterator().next();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetCacheType()
+ */
+ protected String handleGetCacheType()
+ {
+ String cacheType = (String)findTaggedValue(EJB3Profile.TAGGEDVALUE_HIBERNATE_ENTITY_CACHE);
+ if (StringUtils.isBlank(cacheType))
+ {
+ cacheType = String.valueOf(this.getConfiguredProperty(HIBERNATE_ENTITY_CACHE));
+ }
+ return StringUtils.trimToEmpty(cacheType);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsCacheEnabled()
+ */
+ protected boolean handleIsCacheEnabled()
+ {
+ return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(HIBERNATE_ENABLE_CACHE)));
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-03-16 15:32:41
|
User: vancek
Date: 06/03/16 07:32:37
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
refactored handleGetAttributesAsList to check for overriding LOB type if specified via tagged value @andromda.persistence.lob.type.
Revision Changes Path
1.16 +12 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -w -r1.15 -r1.16
--- EJB3EntityFacadeLogicImpl.java 14 Mar 2006 06:23:03 -0000 1.15
+++ EJB3EntityFacadeLogicImpl.java 16 Mar 2006 15:32:37 -0000 1.16
@@ -914,7 +914,18 @@
separator = ", ";
if (includeTypes)
{
+ /**
+ * If attribute is a LOB and lob type is overriden, then use
+ * overriding lob type.
+ */
+ if (attr.isLob() && StringUtils.isNotBlank(attr.getLobType()))
+ {
+ sb.append(attr.getLobType());
+ }
+ else
+ {
sb.append(attr.getType().getFullyQualifiedName());
+ }
sb.append(" ");
}
if (includeNames)
|
|
From: Vance K. <va...@us...> - 2006-03-20 08:47:02
|
User: vancek
Date: 06/03/20 00:47:01
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
implemented handleIsUseDefaultCacheRegion.
Revision Changes Path
1.17 +14 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -w -r1.16 -r1.17
--- EJB3EntityFacadeLogicImpl.java 16 Mar 2006 15:32:37 -0000 1.16
+++ EJB3EntityFacadeLogicImpl.java 20 Mar 2006 08:47:00 -0000 1.17
@@ -161,6 +161,12 @@
*/
private static final String HIBERNATE_ENTITY_CACHE = "hibernateEntityCache";
+ /**
+ * The property that determines whether to use the default cache region for
+ * entities and queries.
+ */
+ private static final String USE_DEFAULT_CACHE_REGION = "useDefaultCacheRegion";
+
// ---------------- constructor -------------------------------
public EJB3EntityFacadeLogicImpl (Object metaObject, String context)
@@ -1083,4 +1089,12 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(HIBERNATE_ENABLE_CACHE)));
}
+
+ /*(
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsUseDefaultCacheRegion()
+ */
+ protected boolean handleIsUseDefaultCacheRegion()
+ {
+ return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(USE_DEFAULT_CACHE_REGION)));
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-24 02:52:47
|
User: vancek
Date: 06/04/23 19:52:46
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
added implementations for handleGetDaoName, handleGetFullyQualifiedDaoName, handleGetDaoImplementationName, handleGetFullyQualifiedDaoImplementationName, handleGetDaoBaseName, handleGetFullyQualifiedDaoBaseName, handleIsDaoBusinessOperationsPresent, handleGetDaoBusinessOperations, handleGetValueObjectReferences, handleGetAllValueObjectReferences, handleIsDaoImplementationRequired, handleGetDaoNoTransformationConstantName, handleGetDaoDefaultExceptionName, handleGetFullyQualifiedDaoDefaultExceptionName, handleGetValueObjectReferences, handleGetRoot and handleGetDefaultPersistenceContextUnitName
Revision Changes Path
1.18 +263 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- EJB3EntityFacadeLogicImpl.java 20 Mar 2006 08:47:00 -0000 1.17
+++ EJB3EntityFacadeLogicImpl.java 24 Apr 2006 02:52:46 -0000 1.18
@@ -16,14 +16,19 @@
import org.andromda.metafacades.uml.ClassifierFacade;
import org.andromda.metafacades.uml.DependencyFacade;
import org.andromda.metafacades.uml.EntityAttribute;
+import org.andromda.metafacades.uml.EnumerationFacade;
+import org.andromda.metafacades.uml.FilteredCollection;
+import org.andromda.metafacades.uml.GeneralizableElementFacade;
import org.andromda.metafacades.uml.MetafacadeUtils;
import org.andromda.metafacades.uml.OperationFacade;
import org.andromda.metafacades.uml.TypeMappings;
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
import org.andromda.metafacades.uml.UMLProfile;
+import org.andromda.metafacades.uml.ValueObject;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.BooleanUtils;
+import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
@@ -167,6 +172,21 @@
*/
private static final String USE_DEFAULT_CACHE_REGION = "useDefaultCacheRegion";
+ /**
+ * The pattern used to construct the DAO implementation name.
+ */
+ private static final String DAO_IMPLEMENTATION_PATTERN = "daoImplementationNamePattern";
+
+ /**
+ * The pattern used to construct the DAO base name.
+ */
+ private static final String DAO_BASE_PATTERN = "daoBaseNamePattern";
+
+ /**
+ * The property which stores the pattern defining the DAO default exception name.
+ */
+ private static final String DAO_DEFAULT_EXCEPTION_NAME_PATTERN = "daoDefaultExceptionNamePattern";
+
// ---------------- constructor -------------------------------
public EJB3EntityFacadeLogicImpl (Object metaObject, String context)
@@ -1097,4 +1117,247 @@
{
return BooleanUtils.toBoolean(String.valueOf(this.getConfiguredProperty(USE_DEFAULT_CACHE_REGION)));
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoName()
+ */
+ protected String handleGetDaoName()
+ {
+ return MessageFormat.format(
+ getDaoNamePattern(),
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
+ * Gets the value of the {@link #DAO_PATTERN}
+ *
+ * @return the DAO name pattern.
+ */
+ private String getDaoNamePattern()
+ {
+ return String.valueOf(this.getConfiguredProperty(EJB3Globals.DAO_PATTERN));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedDaoName()
+ */
+ protected String handleGetFullyQualifiedDaoName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getDaoName(),
+ null);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoImplementationName()
+ */
+ protected String handleGetDaoImplementationName()
+ {
+ return MessageFormat.format(
+ getDaoImplementationNamePattern(),
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
+ * Gets the value of the {@link #DAO_IMPLEMENTATION_PATTERN}
+ *
+ * @return the DAO implementation name pattern.
+ */
+ private String getDaoImplementationNamePattern()
+ {
+ return String.valueOf(this.getConfiguredProperty(DAO_IMPLEMENTATION_PATTERN));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic
+ * #handleGetFullyQualifiedDaoImplementationName()
+ */
+ protected String handleGetFullyQualifiedDaoImplementationName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getDaoImplementationName(),
+ null);
+ }
+
+ /*
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoBaseName()
+ */
+ protected String handleGetDaoBaseName()
+ {
+ return MessageFormat.format(
+ getDaoBaseNamePattern(),
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
+ * Gets the value of the {@link #DAO_BASE_PATTERN}
+ *
+ * @return the DAO base name pattern.
+ */
+ private String getDaoBaseNamePattern()
+ {
+ return String.valueOf(this.getConfiguredProperty(DAO_BASE_PATTERN));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetFullyQualifiedDaoBaseName()
+ */
+ protected String handleGetFullyQualifiedDaoBaseName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getDaoBaseName(),
+ null);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsDaoBusinessOperationsPresent()
+ */
+ protected boolean handleIsDaoBusinessOperationsPresent()
+ {
+ return this.getDaoBusinessOperations() != null && !this.getDaoBusinessOperations().isEmpty();
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoBusinessOperations()
+ */
+ protected Collection handleGetDaoBusinessOperations()
+ {
+ // operations that are not finders and static
+ Collection finders = this.getQueryOperations();
+ Collection operations = this.getOperations();
+
+ Collection nonFinders = CollectionUtils.subtract(operations, finders);
+ CollectionUtils.filter(
+ nonFinders,
+ new Predicate()
+ {
+ public boolean evaluate(Object object)
+ {
+ return ((OperationFacade)object).isStatic();
+ }
+ }
+ );
+ return nonFinders;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetValueObjectReferences()
+ */
+ protected Collection handleGetValueObjectReferences()
+ {
+ return this.getValueObjectReferences(false);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetAllValueObjectReferences()
+ */
+ protected Collection handleGetAllValueObjectReferences()
+ {
+ return this.getValueObjectReferences(true);
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsDaoImplementationRequired()
+ */
+ protected boolean handleIsDaoImplementationRequired()
+ {
+ return !this.getValueObjectReferences().isEmpty() || !this.getDaoBusinessOperations().isEmpty() ||
+ !this.getQueryOperations(true).isEmpty();
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoNoTransformationConstantName()
+ */
+ protected String handleGetDaoNoTransformationConstantName()
+ {
+ return EJB3Globals.TRANSFORMATION_CONSTANT_PREFIX + EJB3Globals.NO_TRANSFORMATION_CONSTANT_SUFFIX;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetValueObjectReferences(boolean)
+ */
+ protected Collection handleGetValueObjectReferences(boolean follow)
+ {
+ final Collection sourceDependencies = new ArrayList(this.getSourceDependencies());
+ if (follow)
+ {
+ for (
+ GeneralizableElementFacade entity = this.getGeneralization(); entity != null;
+ entity = entity.getGeneralization())
+ {
+ sourceDependencies.addAll(entity.getSourceDependencies());
+ }
+ }
+ return new FilteredCollection(sourceDependencies)
+ {
+ public boolean evaluate(Object object)
+ {
+ boolean valid = false;
+ Object targetElement = ((DependencyFacade)object).getTargetElement();
+ if (targetElement instanceof ClassifierFacade)
+ {
+ ClassifierFacade element = (ClassifierFacade)targetElement;
+ valid = element.isDataType() || element instanceof ValueObject || element instanceof EnumerationFacade;
+ }
+ return valid;
+ }
+ };
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetRoot()
+ */
+ protected Object handleGetRoot()
+ {
+ GeneralizableElementFacade generalization = this;
+ for (
+ ; generalization.getGeneralization() != null && generalization instanceof EJB3EntityFacade;
+ generalization = generalization.getGeneralization())
+ ;
+ return generalization;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDefaultPersistenceContextUnitName()
+ */
+ protected String handleGetDefaultPersistenceContextUnitName()
+ {
+ return StringUtils.trimToEmpty(
+ ObjectUtils.toString(this.getConfiguredProperty(EJB3Globals.PERSISTENCE_CONTEXT_UNIT_NAME)));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetDaoDefaultExceptionName()
+ */
+ protected String handleGetDaoDefaultExceptionName()
+ {
+ return MessageFormat.format(
+ getDaoDefaultExceptionNamePattern(),
+ new Object[] {StringUtils.trimToEmpty(this.getName())});
+ }
+
+ /**
+ * Gets the value of the {@link #DAO_DEFAULT_EXCEPTION_NAME_PATTERN}
+ *
+ * @return the DAO default exception name pattern.
+ */
+ private String getDaoDefaultExceptionNamePattern()
+ {
+ return String.valueOf(this.getConfiguredProperty(DAO_DEFAULT_EXCEPTION_NAME_PATTERN));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleGetFullyQualifiedDaoDefaultExceptionName()
+ */
+ protected String handleGetFullyQualifiedDaoDefaultExceptionName()
+ {
+ return EJB3MetafacadeUtils.getFullyQualifiedName(
+ this.getPackageName(),
+ this.getDaoDefaultExceptionName(),
+ null);
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-26 15:22:10
|
User: vancek
Date: 06/04/26 08:21:59
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
handleGetDiscriminatorValue returns the first character if one isn't specified using tagged value. implemented handleIsEntityImplementationRequired.
Revision Changes Path
1.19 +15 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -w -r1.18 -r1.19
--- EJB3EntityFacadeLogicImpl.java 24 Apr 2006 02:52:46 -0000 1.18
+++ EJB3EntityFacadeLogicImpl.java 26 Apr 2006 15:21:59 -0000 1.19
@@ -751,7 +751,13 @@
*/
protected String handleGetDiscriminatorValue()
{
- return (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_DISCRIMINATOR_VALUE);
+ String discriminatorValue =
+ (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_PERSISTENCE_DISCRIMINATOR_VALUE);
+ if (StringUtils.isBlank(discriminatorValue))
+ {
+ discriminatorValue = StringUtils.substring(this.getEntityName(), 0, 1);
+ }
+ return discriminatorValue;
}
/**
@@ -1360,4 +1366,12 @@
this.getDaoDefaultExceptionName(),
null);
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsEntityImplementationRequired()
+ */
+ protected boolean handleIsEntityImplementationRequired()
+ {
+ return !this.getBusinessOperations().isEmpty() || this.isEmbeddableSuperclass();
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-27 06:52:47
|
User: vancek
Date: 06/04/26 23:52:44
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
fixed formatting.
handleIsRequiresSpecializationMapping should not check for root entity.
handleIsEntityImplementationRequired should not check for entity being a mapped superclass.
implemented handleGetInstanceAttributes method with args follow and withIdentifiers.
Revision Changes Path
1.20 +34 -18 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -w -r1.19 -r1.20
--- EJB3EntityFacadeLogicImpl.java 26 Apr 2006 15:21:59 -0000 1.19
+++ EJB3EntityFacadeLogicImpl.java 27 Apr 2006 06:52:44 -0000 1.20
@@ -332,7 +332,9 @@
protected java.util.Collection handleGetValueDependencies()
{
Collection dependencies = super.getSourceDependencies();
- CollectionUtils.filter(dependencies, new Predicate()
+ CollectionUtils.filter(
+ dependencies,
+ new Predicate()
{
public boolean evaluate(Object object)
{
@@ -866,10 +868,8 @@
*/
protected boolean handleIsRequiresSpecializationMapping()
{
- return this.isRoot()
- && (this.isInheritanceSingleTable()
- || this.isInheritanceTablePerClass() || this.isInheritanceJoined())
- && (!this.getSpecializations().isEmpty());
+ return (this.isInheritanceSingleTable() || this.isInheritanceTablePerClass() || this.isInheritanceJoined())
+ && !this.getSpecializations().isEmpty();
}
/**
@@ -1372,6 +1372,22 @@
*/
protected boolean handleIsEntityImplementationRequired()
{
- return !this.getBusinessOperations().isEmpty() || this.isEmbeddableSuperclass();
+ return !this.getBusinessOperations().isEmpty();
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetInstanceAttributes(boolean, boolean)
+ */
+ protected Collection handleGetInstanceAttributes(
+ boolean follow,
+ boolean withIdentifiers)
+ {
+ return new FilteredCollection(this.getAttributes(follow, withIdentifiers))
+ {
+ public boolean evaluate(Object object)
+ {
+ return !((AttributeFacade)object).isStatic();
+ }
+ };
}
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-04-30 01:57:25
|
User: vancek
Date: 06/04/29 18:57:24
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
implemented handleGetInstanceAttributeNameList and handleGetInstanceAttributeTypeList methods used in DAO components create methods that include entity instance properties
Revision Changes Path
1.21 +102 -1 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -w -r1.20 -r1.21
--- EJB3EntityFacadeLogicImpl.java 27 Apr 2006 06:52:44 -0000 1.20
+++ EJB3EntityFacadeLogicImpl.java 30 Apr 2006 01:57:24 -0000 1.21
@@ -12,9 +12,11 @@
import org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacade;
import org.andromda.cartridges.ejb3.metafacades.EJB3OperationFacade;
import org.andromda.core.common.ExceptionRecorder;
+import org.andromda.metafacades.uml.AssociationEndFacade;
import org.andromda.metafacades.uml.AttributeFacade;
import org.andromda.metafacades.uml.ClassifierFacade;
import org.andromda.metafacades.uml.DependencyFacade;
+import org.andromda.metafacades.uml.EntityAssociationEnd;
import org.andromda.metafacades.uml.EntityAttribute;
import org.andromda.metafacades.uml.EnumerationFacade;
import org.andromda.metafacades.uml.FilteredCollection;
@@ -25,6 +27,7 @@
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
import org.andromda.metafacades.uml.UMLProfile;
import org.andromda.metafacades.uml.ValueObject;
+import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
import org.apache.commons.lang.BooleanUtils;
@@ -1306,7 +1309,8 @@
if (targetElement instanceof ClassifierFacade)
{
ClassifierFacade element = (ClassifierFacade)targetElement;
- valid = element.isDataType() || element instanceof ValueObject || element instanceof EnumerationFacade;
+ valid = element.isDataType() || element instanceof ValueObject ||
+ element instanceof EnumerationFacade;
}
return valid;
}
@@ -1390,4 +1394,101 @@
}
};
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleGetInstanceAttributeNameList(boolean, boolean)
+ */
+ protected String handleGetInstanceAttributeNameList(boolean follow, boolean withIdentifiers)
+ {
+ return this.getNameList(this.getInstanceAttributes(follow, withIdentifiers));
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#
+ * handleGetInstanceAttributeTypeList(boolean, boolean)
+ */
+ protected String handleGetInstanceAttributeTypeList(boolean follow, boolean withIdentifiers)
+ {
+ return this.getTypeList(this.getInstanceAttributes(follow, withIdentifiers));
+ }
+
+ /**
+ * Constructs a comma seperated list of attribute type names from the passed in collection of
+ * <code>attributes</code>.
+ *
+ * @param attributes the attributes to construct the list from.
+ * @return the comma seperated list of attribute types.
+ */
+ private String getTypeList(final Collection attributes)
+ {
+ final StringBuffer list = new StringBuffer();
+ final String comma = ", ";
+ CollectionUtils.forAllDo(
+ attributes,
+ new Closure()
+ {
+ public void execute(final Object object)
+ {
+ if (object instanceof AttributeFacade)
+ {
+ final AttributeFacade attribute = (AttributeFacade)object;
+ if (attribute.getType() != null)
+ {
+ list.append(attribute.getType().getFullyQualifiedName());
+ list.append(comma);
+ }
+ }
+ if (object instanceof AssociationEndFacade)
+ {
+ final AssociationEndFacade associationEnd = (AssociationEndFacade)object;
+ if (associationEnd.getType() != null)
+ {
+ list.append(associationEnd.getType().getFullyQualifiedName());
+ list.append(comma);
+ }
+ }
+ }
+ });
+ if (list.toString().endsWith(comma))
+ {
+ list.delete(list.lastIndexOf(comma), list.length());
+ }
+ return list.toString();
+ }
+
+ /**
+ * Constructs a comma seperated list of attribute names from the passed in collection of <code>attributes</code>.
+ *
+ * @param properties the properties to construct the list from.
+ * @return the comma seperated list of attribute names.
+ */
+ private String getNameList(final Collection properties)
+ {
+ final StringBuffer list = new StringBuffer();
+ final String comma = ", ";
+ CollectionUtils.forAllDo(
+ properties,
+ new Closure()
+ {
+ public void execute(Object object)
+ {
+ if (object instanceof EntityAttribute)
+ {
+ list.append(((AttributeFacade)object).getName());
+ list.append(comma);
+ }
+ if (object instanceof EntityAssociationEnd)
+ {
+ list.append(((AssociationEndFacade)object).getName());
+ list.append(comma);
+ }
+ }
+ });
+ if (list.toString().endsWith(comma))
+ {
+ list.delete(list.lastIndexOf(comma), list.length());
+ }
+ return list.toString();
+ }
}
\ No newline at end of file
|
|
From: Vance K. <va...@us...> - 2006-05-02 01:59:50
|
User: vancek
Date: 06/05/01 18:59:49
Modified: andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades
EJB3EntityFacadeLogicImpl.java
Log:
implemented handleIsSecurityEnabled, handleGetRolesAllowed, handleGetSecurityRealm and handleGetNonRunAsRoles for DAO components
Revision Changes Path
1.22 +93 -0 cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java
Index: EJB3EntityFacadeLogicImpl.java
===================================================================
RCS file: /cvsroot/andromdaplugins/cartridges/andromda-ejb3/src/main/java/org/andromda/cartridges/ejb3/metafacades/EJB3EntityFacadeLogicImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -w -r1.21 -r1.22
--- EJB3EntityFacadeLogicImpl.java 30 Apr 2006 01:57:24 -0000 1.21
+++ EJB3EntityFacadeLogicImpl.java 2 May 2006 01:59:49 -0000 1.22
@@ -5,6 +5,7 @@
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import org.andromda.cartridges.ejb3.EJB3Globals;
import org.andromda.cartridges.ejb3.EJB3Profile;
@@ -23,6 +24,7 @@
import org.andromda.metafacades.uml.GeneralizableElementFacade;
import org.andromda.metafacades.uml.MetafacadeUtils;
import org.andromda.metafacades.uml.OperationFacade;
+import org.andromda.metafacades.uml.Role;
import org.andromda.metafacades.uml.TypeMappings;
import org.andromda.metafacades.uml.UMLMetafacadeProperties;
import org.andromda.metafacades.uml.UMLProfile;
@@ -30,6 +32,7 @@
import org.apache.commons.collections.Closure;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.Predicate;
+import org.apache.commons.collections.Transformer;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
@@ -1491,4 +1494,94 @@
}
return list.toString();
}
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleIsSecurityEnabled()
+ */
+ protected boolean handleIsSecurityEnabled()
+ {
+ return StringUtils.isNotBlank(this.getSecurityRealm());
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetRolesAllowed()
+ */
+ protected String handleGetRolesAllowed()
+ {
+ StringBuffer rolesAllowed = null;
+ String separator = "";
+
+ for (final Iterator iter = this.getNonRunAsRoles().iterator(); iter.hasNext(); )
+ {
+ if (rolesAllowed == null)
+ {
+ rolesAllowed = new StringBuffer();
+ }
+ rolesAllowed.append(separator);
+ Role role = (Role)iter.next();
+ rolesAllowed.append('"');
+ rolesAllowed.append(role.getName());
+ rolesAllowed.append('"');
+ separator = ", ";
+ }
+ return rolesAllowed != null ? rolesAllowed.toString() : null;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetSecurityRealm()
+ */
+ protected String handleGetSecurityRealm()
+ {
+ String securityRealm = (String)this.findTaggedValue(EJB3Profile.TAGGEDVALUE_EJB_SECURITY_REALM);
+ if (StringUtils.isBlank(securityRealm))
+ {
+ securityRealm = StringUtils.trimToEmpty(
+ ObjectUtils.toString(this.getConfiguredProperty(EJB3Globals.SECURITY_REALM)));
+ }
+ return securityRealm;
+ }
+
+ /**
+ * @see org.andromda.cartridges.ejb3.metafacades.EJB3EntityFacadeLogic#handleGetNonRunAsRoles()
+ */
+ protected Collection handleGetNonRunAsRoles()
+ {
+ Collection roles = this.getTargetDependencies();
+ CollectionUtils.filter(
+ roles,
+ new Predicate()
+ {
+ public boolean evaluate(final Object object)
+ {
+ DependencyFacade dependency = (DependencyFacade)object;
+ return dependency != null
+ && dependency.getSourceElement() != null
+ && dependency.getSourceElement() instanceof Role
+ && !dependency.hasStereotype(EJB3Profile.STEREOTYPE_SECURITY_RUNAS);
+ }
+ });
+ CollectionUtils.transform(
+ roles,
+ new Transformer()
+ {
+ public Object transform(final Object object)
+ {
+ return ((DependencyFacade)object).getSourceElement();
+ }
+ });
+ final Collection allRoles = new LinkedHashSet(roles);
+ // add all roles which are generalizations of this one
+ CollectionUtils.forAllDo(
+ roles,
+ new Closure()
+ {
+ public void execute(final Object object)
+ {
+ allRoles.addAll(((Role)object).getAllSpecializations());
+ }
+ });
+ return allRoles;
+ }
+
+
}
\ No newline at end of file
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X