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/14 06:22:00 UTC
svn commit: r726364 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi:
mapping/MappingApiToModel.java mapping/MappingModelToApi.java
model/BindingTemplate.java model/KeyedReference.java
model/KeyedReferenceGroup.java
Author: kstam
Date: Sat Dec 13 21:21:58 2008
New Revision: 726364
URL: http://svn.apache.org/viewvc?rev=726364&view=rev
Log:
JUDDI-145, adding KeyedReferenceGroup mapping back in.
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/BindingTemplate.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.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=726364&r1=726363&r2=726364&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 21:21:58 2008
@@ -60,8 +60,8 @@
mapContacts(apiBusinessEntity.getContacts(), modelBusinessEntity.getContacts(), modelBusinessEntity);
mapBusinessIdentifiers(apiBusinessEntity.getIdentifierBag(), modelBusinessEntity.getBusinessIdentifiers(), modelBusinessEntity);
if (apiBusinessEntity.getCategoryBag()!=null) {
- //TODO put the mapping back
- //mapCategoryBag(apiBusinessEntity.getCategoryBag(), modelBusinessEntity.getCategoryBag());
+ modelBusinessEntity.setCategoryBag(new org.apache.juddi.model.BusinessCategoryBag());
+ mapCategoryBag(apiBusinessEntity.getCategoryBag(), modelBusinessEntity.getCategoryBag());
}
mapBusinessServices(apiBusinessEntity.getBusinessServices(), modelBusinessEntity.getBusinessServices(), modelBusinessEntity);
@@ -252,7 +252,8 @@
mapServiceNames(apiBusinessService.getName(), modelBusinessService.getServiceNames(), modelBusinessService);
mapServiceDescriptions(apiBusinessService.getDescription(), modelBusinessService.getServiceDescrs(), modelBusinessService);
if (apiBusinessService.getCategoryBag()!=null) {
- // mapCategoryBag(apiBusinessService.getCategoryBag(), modelBusinessService.getCategoryBag());
+ modelBusinessService.setCategoryBag(new org.apache.juddi.model.ServiceCategoryBag());
+ mapCategoryBag(apiBusinessService.getCategoryBag(), modelBusinessService.getCategoryBag());
}
mapBindingTemplates(apiBusinessService.getBindingTemplates(), modelBusinessService.getBindingTemplates(), modelBusinessService);
@@ -312,7 +313,10 @@
//modelBindingTemplate.setHostingRedirector(apiBindingTemplate.getHostingRedirector().getBindingKey());
mapBindingDescriptions(apiBindingTemplate.getDescription(), modelBindingTemplate.getBindingDescrs(), modelBindingTemplate);
- //mapCategoryBag(apiBindingTemplate.getCategoryBag(), modelBindingTemplate.getBindingTemplateCategoryBag());
+ if (apiBindingTemplate.getCategoryBag()!=null) {
+ modelBindingTemplate.setCategoryBag(new org.apache.juddi.model.BindingCategoryBag());
+ mapCategoryBag(apiBindingTemplate.getCategoryBag(), modelBindingTemplate.getCategoryBag());
+ }
mapTModelInstanceDetails(apiBindingTemplate.getTModelInstanceDetails(), modelBindingTemplate.getTmodelInstanceInfos(), modelBindingTemplate);
}
@@ -350,7 +354,7 @@
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,
+ modelKeyedReferences.add(new org.apache.juddi.model.KeyedReference(modelKeyedReferenceGroup,
apiKeyedReference.getTModelKey(), apiKeyedReference.getKeyName(), apiKeyedReference.getKeyValue()));
}
}
@@ -429,8 +433,8 @@
mapTModelDescriptions(apiTModel.getDescription(), modelTModel.getTmodelDescrs(), modelTModel);
mapTModelIdentifiers(apiTModel.getIdentifierBag(), modelTModel.getTmodelIdentifiers(), modelTModel);
if (apiTModel.getCategoryBag()!=null) {
- //modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag());
- //mapCategoryBag(apiTModel.getCategoryBag(), modelTModel.getCategoryBag());
+ modelTModel.setCategoryBag(new org.apache.juddi.model.TmodelCategoryBag());
+ mapCategoryBag(apiTModel.getCategoryBag(), modelTModel.getCategoryBag());
}
//TODO: OverviewDoc - model doesn't have logical mapping
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=726364&r1=726363&r2=726364&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 21:21:58 2008
@@ -334,7 +334,7 @@
mapBindingDescriptions(modelBindingTemplate.getBindingDescrs(), apiBindingTemplate.getDescription());
- apiBindingTemplate.setCategoryBag(mapCategoryBag(modelBindingTemplate.getBindingTemplateCategoryBag(), apiBindingTemplate.getCategoryBag()));
+ apiBindingTemplate.setCategoryBag(mapCategoryBag(modelBindingTemplate.getCategoryBag(), apiBindingTemplate.getCategoryBag()));
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java?rev=726364&r1=726363&r2=726364&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/BindingTemplate.java Sat Dec 13 21:21:58 2008
@@ -104,10 +104,10 @@
}
@OneToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "bindingTemplate")
- public BindingCategoryBag getBindingTemplateCategoryBag() {
+ public BindingCategoryBag getCategoryBag() {
return this.categoryBag;
}
- public void setBindingTemplateCategoryBag(BindingCategoryBag categoryBag) {
+ public void setCategoryBag(BindingCategoryBag categoryBag) {
this.categoryBag = categoryBag;
}
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java?rev=726364&r1=726363&r2=726364&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/KeyedReference.java Sat Dec 13 21:21:58 2008
@@ -35,6 +35,7 @@
private static final long serialVersionUID = 1L;
private Long id;
private CategoryBag categoryBag;
+ private KeyedReferenceGroup keyedReferenceGroup;
private String tmodelKeyRef;
private String keyName;
private String keyValue;
@@ -46,6 +47,15 @@
this.categoryBag = categoryBag;
this.keyValue = keyValue;
}
+
+ public KeyedReference(KeyedReferenceGroup keyedReferenceGroup, String tmodelKeyRef,
+ String keyName, String keyValue) {
+ this.keyedReferenceGroup = keyedReferenceGroup;
+ this.tmodelKeyRef = tmodelKeyRef;
+ this.keyName = keyName;
+ this.keyValue = keyValue;
+ }
+
public KeyedReference(CategoryBag categoryBag, String tmodelKeyRef,
String keyName, String keyValue) {
this.categoryBag = categoryBag;
@@ -64,13 +74,22 @@
}
@ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "category_bag_id", nullable = false)
+ @JoinColumn(name = "category_bag_id", nullable = true)
public CategoryBag getCategoryBag() {
return this.categoryBag;
}
public void setCategoryBag(CategoryBag categoryBag) {
this.categoryBag = categoryBag;
}
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "keyed_reference_group_id", nullable = true)
+ public KeyedReferenceGroup getKeyedReferenceGroup() {
+ return keyedReferenceGroup;
+ }
+ public void setKeyedReferenceGroup(KeyedReferenceGroup keyedReferenceGroup) {
+ this.keyedReferenceGroup = keyedReferenceGroup;
+ }
@Column(name = "tmodel_key_ref", length = 255)
public String getTmodelKeyRef() {
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=726364&r1=726363&r2=726364&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 21:21:58 2008
@@ -78,7 +78,7 @@
this.categoryBag = categoryBag;
}
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "categoryBag")
+ @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY, mappedBy = "keyedReferenceGroup")
public Set<KeyedReference> getKeyedReferences() {
return keyedReferences;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org