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 2009/02/21 14:39:59 UTC
svn commit: r746508 - in
/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model:
Publisher.java UddiEntityPublisher.java
Author: kstam
Date: Sat Feb 21 13:39:58 2009
New Revision: 746508
URL: http://svn.apache.org/viewvc?rev=746508&view=rev
Log:
JUDDI-195, Fixing OpenJPA warnings about:
1. Needing a no-arg constructor (UddiEntityPublisher)
2. Use the getter assessors
Modified:
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java?rev=746508&r1=746507&r2=746508&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/Publisher.java Sat Feb 21 13:39:58 2009
@@ -93,8 +93,8 @@
@Transient
public boolean isAdmin() {
boolean ret = false;
- if (this.isAdmin != null) {
- if (this.isAdmin.equalsIgnoreCase("true"))
+ if (getIsAdmin() != null) {
+ if (getIsAdmin().equalsIgnoreCase("true"))
ret = true;
}
return ret;
@@ -111,8 +111,8 @@
@Transient
public boolean isEnabled() {
boolean ret = false;
- if (this.isEnabled != null) {
- if (this.isEnabled.equalsIgnoreCase("true"))
+ if (getIsEnabled() != null) {
+ if (getIsEnabled().equalsIgnoreCase("true"))
ret = true;
}
return ret;
Modified: webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java
URL: http://svn.apache.org/viewvc/webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java?rev=746508&r1=746507&r2=746508&view=diff
==============================================================================
--- webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java (original)
+++ webservices/juddi/branches/v3_trunk/juddi-core/src/main/java/org/apache/juddi/model/UddiEntityPublisher.java Sat Feb 21 13:39:58 2009
@@ -43,6 +43,9 @@
protected String authorizedName;
private List<String> keyGeneratorKeys = null;
+ public UddiEntityPublisher() {
+ }
+
public UddiEntityPublisher(String authorizedName) {
this.authorizedName = authorizedName;
}
@@ -70,13 +73,14 @@
getKeysQuery.append("select t.entityKey from Tmodel t").pad().WHERE().pad();
DynamicQuery.Parameter pubParam = new DynamicQuery.Parameter("t.authorizedName",
- this.authorizedName,
+ getAuthorizedName(),
DynamicQuery.PREDICATE_EQUALS);
DynamicQuery.Parameter keyParam = new DynamicQuery.Parameter("UPPER(t.entityKey)",
(DynamicQuery.WILDCARD + KeyGenerator.KEYGENERATOR_SUFFIX).toUpperCase(),
DynamicQuery.PREDICATE_LIKE);
+
getKeysQuery.appendGroupedAnd(pubParam, keyParam);
Query qry = getKeysQuery.buildJPAQuery(em);
@@ -86,7 +90,7 @@
public boolean isOwner(UddiEntity entity){
boolean ret = false;
if (entity != null) {
- if (entity.getAuthorizedName().equals(this.authorizedName))
+ if (entity.getAuthorizedName().equals(getAuthorizedName()))
ret = true;
}
return ret;
@@ -137,7 +141,7 @@
Vector<DynamicQuery.Parameter> params = new Vector<DynamicQuery.Parameter>(0);
DynamicQuery.Parameter pubParam = new DynamicQuery.Parameter("t.authorizedName",
- this.authorizedName,
+ getAuthorizedName(),
DynamicQuery.PREDICATE_EQUALS);
int requiredCount = 0;
@@ -176,7 +180,7 @@
// If only two tokens, then a domain key generator is being checked. A domain key generator can only be registered if no other publishers
// own it. For example, if trying to register the uddi:domain:abc:123 key then uddi:domain cannot be owned by another publisher.
DynamicQuery.Parameter notPubParam = new DynamicQuery.Parameter("t.authorizedName",
- this.authorizedName,
+ getAuthorizedName(),
DynamicQuery.PREDICATE_NOTEQUALS);
DynamicQuery.Parameter keyParam = new DynamicQuery.Parameter("UPPER(t.entityKey)",
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org