You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2008/12/13 16:39:17 UTC
svn commit: r726222 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi:
mapping/MappingApiToModel.java mapping/MappingModelToApi.java
model/KeyedReferenceGroup.java
Author: kstam
Date: Sat Dec 13 07:39:16 2008
New Revision: 726222
URL: http://svn.apache.org/viewvc?rev=726222&view=rev
Log:
JUDDI-145, adding KeyedReferenceGroup mapping
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReferenceGroup.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java?rev=726222&r1=726221&r2=726222&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java Sat Dec 13 07:39:16 2008
@@ -94,7 +94,6 @@
if (apiDiscUrls != null) {
List<org.uddi.api_v3.DiscoveryURL> apiDiscUrlList = apiDiscUrls.getDiscoveryURL();
- int id = 0;
for (org.uddi.api_v3.DiscoveryURL apiDiscUrl : apiDiscUrlList) {
modelDiscUrlList.add(new org.apache.juddi.model.DiscoveryUrl(modelBusinessEntity, apiDiscUrl.getUseType(), apiDiscUrl.getValue()));
}
@@ -109,7 +108,6 @@
if (apiContacts != null) {
List<org.uddi.api_v3.Contact> apiContactList = apiContacts.getContact();
- int id = 0;
for (org.uddi.api_v3.Contact apiContact : apiContactList) {
org.apache.juddi.model.Contact modelContact = new org.apache.juddi.model.Contact(modelBusinessEntity);
modelContact.setUseType(apiContact.getUseType());
@@ -132,7 +130,6 @@
throws DispositionReportFaultMessage {
modelDescList.clear();
- int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
modelDescList.add(new org.apache.juddi.model.ContactDescr(modelContact, apiDesc.getLang(), apiDesc.getValue()));
}
@@ -326,24 +323,31 @@
public static void mapCategoryBag(org.uddi.api_v3.CategoryBag apiCategoryBag,
org.apache.juddi.model.CategoryBag modelCategoryBag)
throws DispositionReportFaultMessage {
- Set<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
- modelKeyedReferences.clear();
- Set<org.apache.juddi.model.KeyedReferenceGroup> modelKeyedReferenceGroups=modelCategoryBag.getKeyedReferenceGroups();
- modelKeyedReferenceGroups.clear();
if (apiCategoryBag != null) {
List<JAXBElement<?>> apiCategoryList = apiCategoryBag.getContent();
for (JAXBElement<?> elem : apiCategoryList) {
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReference) {
+ Set<org.apache.juddi.model.KeyedReference> modelKeyedReferences=modelCategoryBag.getKeyedReferences();
+ modelKeyedReferences.clear();
org.uddi.api_v3.KeyedReference apiKeyedReference = (org.uddi.api_v3.KeyedReference)elem.getValue();
modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
- apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
if (elem.getValue() instanceof org.uddi.api_v3.KeyedReferenceGroup) {
+ Set<org.apache.juddi.model.KeyedReferenceGroup> modelKeyedReferenceGroups=modelCategoryBag.getKeyedReferenceGroups();
+ modelKeyedReferenceGroups.clear();
org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = (org.uddi.api_v3.KeyedReferenceGroup) elem.getValue();
- // TODO: Currently, the model doesn't allow for the persistence of keyedReference groups. This must be incorporated into the model. For now
- // the KeyedReferenceGroups are ignored.
+ org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup = new org.apache.juddi.model.KeyedReferenceGroup(modelCategoryBag,apiKeyedReferenceGroup.getTModelKey());
+ modelKeyedReferenceGroups.add(modelKeyedReferenceGroup);
+ if (apiKeyedReferenceGroup.getKeyedReference() != null) {
+ Set<org.apache.juddi.model.KeyedReference> modelKeyedReferences = modelKeyedReferenceGroup.getKeyedReferences();
+ for (org.uddi.api_v3.KeyedReference apiKeyedReference : apiKeyedReferenceGroup.getKeyedReference()) {
+ modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelCategoryBag,
+ apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
+ }
+ }
}
}
}
@@ -375,7 +379,6 @@
throws DispositionReportFaultMessage {
modelDescList.clear();
- int id = 0;
for (org.uddi.api_v3.Description apiDesc : apiDescList) {
modelDescList.add(new org.apache.juddi.model.TmodelInstanceInfoDescr(modelTModelInstInfo, apiDesc.getLang(), apiDesc.getValue()));
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java?rev=726222&r1=726221&r2=726222&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java Sat Dec 13 07:39:16 2008
@@ -361,15 +361,23 @@
apiCategoryList.clear();
for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelCategoryBag.getKeyedReferences()) {
- org.uddi.api_v3.KeyedReference apiKeyedRef = new org.uddi.api_v3.KeyedReference();
- apiKeyedRef.setTModelKey(modelKeyedReference.getTmodelKeyRef());
- apiKeyedRef.setKeyName(modelKeyedReference.getKeyName());
- apiKeyedRef.setKeyValue(modelKeyedReference.getKeyValue());
- apiCategoryList.add(new ObjectFactory().createKeyedReference(apiKeyedRef));
+ org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
+ apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
+ apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
+ apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
+ apiCategoryList.add(new ObjectFactory().createKeyedReference(apiKeyedReference));
}
for (org.apache.juddi.model.KeyedReferenceGroup modelKeyedReferenceGroup : modelCategoryBag.getKeyedReferenceGroups()) {
- // TODO: Currently, the model doesn't allow for the persistence of keyedReference groups. This must be incorporated into the model. For now
- // the KeyedReferenceGroups are ignored.
+ org.uddi.api_v3.KeyedReferenceGroup apiKeyedReferenceGroup = new org.uddi.api_v3.KeyedReferenceGroup();
+ apiKeyedReferenceGroup.setTModelKey(modelKeyedReferenceGroup.getTmodelKey());
+ for (org.apache.juddi.model.KeyedReference modelKeyedReference : modelKeyedReferenceGroup.getKeyedReferences()) {
+ org.uddi.api_v3.KeyedReference apiKeyedReference = new org.uddi.api_v3.KeyedReference();
+ apiKeyedReference.setTModelKey(modelKeyedReference.getTmodelKeyRef());
+ apiKeyedReference.setKeyName(modelKeyedReference.getKeyName());
+ apiKeyedReference.setKeyValue(modelKeyedReference.getKeyValue());
+ apiKeyedReferenceGroup.getKeyedReference().add(apiKeyedReference);
+ }
+ apiCategoryList.add(new ObjectFactory().createKeyedReferenceGroup(apiKeyedReferenceGroup));
}
return apiCategoryBag;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReferenceGroup.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReferenceGroup.java?rev=726222&r1=726221&r2=726222&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReferenceGroup.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReferenceGroup.java Sat Dec 13 07:39:16 2008
@@ -15,6 +15,11 @@
* limitations under the License.
*/
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
@@ -22,6 +27,7 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
import javax.persistence.Table;
/**
@@ -34,14 +40,16 @@
private static final long serialVersionUID = 1L;
private Long id;
private CategoryBag categoryBag;
+ private String tmodelKey;
+ private Set<KeyedReference> keyedReferences = new HashSet<KeyedReference>(0);
public KeyedReferenceGroup() {
}
- public KeyedReferenceGroup(CategoryBag categoryBag, String keyValue) {
+ public KeyedReferenceGroup(CategoryBag categoryBag, String tmodelKey) {
this.categoryBag = categoryBag;
-
+ this.tmodelKey = tmodelKey;
}
@Id
@@ -52,6 +60,14 @@
public void setId(Long id) {
this.id = id;
}
+
+ @Column(name = "tmodel_key", length = 255)
+ public String getTmodelKey() {
+ return this.tmodelKey;
+ }
+ public void setTmodelKey(String tmodelKey) {
+ this.tmodelKey = tmodelKey;
+ }
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "id", nullable = false, insertable = false, updatable = false)
@@ -61,5 +77,13 @@
public void setCategoryBag(CategoryBag categoryBag) {
this.categoryBag = categoryBag;
}
+
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "categoryBag")
+ public Set<KeyedReference> getKeyedReferences() {
+ return keyedReferences;
+ }
+ public void setKeyedReferences(Set<KeyedReference> keyedReferences) {
+ this.keyedReferences = keyedReferences;
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org