Author: alexoree
Date: Sat Nov 9 20:19:58 2013
New Revision: 1540387
URL: http://svn.apache.org/r1540387
Log:
JUDDI-701 8 more issues fixed
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerk.java
Sat Nov 9 20:19:58 2013
@@ -21,7 +21,6 @@ import java.lang.reflect.UndeclaredThrow
import java.net.URL;
import java.rmi.RemoteException;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -29,8 +28,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.wsdl.Definition;
import javax.xml.ws.Holder;
@@ -1088,7 +1085,7 @@ public class UDDIClerk implements Serial
* @param serviceKey
* @return
*/
- public List<String> GetEndpoints(String serviceKey){
+ public List<String> getEndpoints(String serviceKey){
List<String> items = new ArrayList<String>();
ServiceDetail serviceDetail=null;
try{
@@ -1159,6 +1156,7 @@ public class UDDIClerk implements Serial
items.add(get.getAccessPoint().getValue());
} else {
//treat it has an extension or whatever
+ log.info("Unable to figure out the useType for " +
get.getAccessPoint().getValue());
items.add(get.getAccessPoint().getValue());
}
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/mapping/WADL2UDDI.java
Sat Nov 9 20:19:58 2013
@@ -425,7 +425,7 @@ public class WADL2UDDI {
* clerkManager.getClientConfig().isX_To_Wsdl_Ignore_SSL_Errors() );
* </pre>
*/
- public static Application ParseWadl(URL weburl, String username, String
password, boolean ignoreSSLErrors){
+ public static Application parseWadl(URL weburl, String username, String
password, boolean ignoreSSLErrors){
DefaultHttpClient httpclient = null;
Application unmarshal=null;
try {
@@ -491,7 +491,7 @@ public class WADL2UDDI {
return unmarshal;
}
- public static Application ParseWadl(File file) throws
FileNotFoundException, IOException {
+ public static Application parseWadl(File file) throws
FileNotFoundException, IOException {
Application unmarshal = JAXB.unmarshal(file, Application.class);
return unmarshal;
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISubscriptionImpl.java
Sat Nov 9 20:19:58 2013
@@ -750,7 +750,7 @@ public class UDDISubscriptionImpl extend
catch(ConfigurationException ce) {
throw new FatalErrorException(new
ErrorMessage("errors.configuration.Retrieval"));
}
- newChunkToken.setExpiresAfter(new
Date(System.currentTimeMillis() + chunkExpirationMinutes * 60 * 1000));
+ newChunkToken.setExpiresAfter(new
Date(System.currentTimeMillis() + ((long)chunkExpirationMinutes * 60L *
1000L)));
em.persist(newChunkToken);
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
Sat Nov 9 20:19:58 2013
@@ -34,7 +34,7 @@ public class BindingTemplateQuery extend
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select distinct "+ ENTITY_ALIAS + "." + KEY_NAME +
" from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
Sat Nov 9 20:19:58 2013
@@ -31,7 +31,7 @@ public class BusinessEntityQuery extends
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select distinct "+ ENTITY_ALIAS + "." + KEY_NAME +
" from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
Sat Nov 9 20:19:58 2013
@@ -33,7 +33,7 @@ public class BusinessServiceQuery extend
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select distinct "+ ENTITY_ALIAS + "." + KEY_NAME +
" from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
Sat Nov 9 20:19:58 2013
@@ -51,7 +51,7 @@ public class FetchBindingTemplatesQuery
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select " + ENTITY_ALIAS + " from " + ENTITY_NAME +
" " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
Sat Nov 9 20:19:58 2013
@@ -51,7 +51,7 @@ public class FetchBusinessEntitiesQuery
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select " + ENTITY_ALIAS + " from " + ENTITY_NAME +
" " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
Sat Nov 9 20:19:58 2013
@@ -51,7 +51,7 @@ public class FetchBusinessServicesQuery
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select " + ENTITY_ALIAS + " from " + ENTITY_NAME +
" " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
Sat Nov 9 20:19:58 2013
@@ -51,7 +51,7 @@ public class FetchTModelsQuery extends T
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select " + ENTITY_ALIAS + " from " + ENTITY_NAME +
" " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByTModelKeyQuery.java
Sat Nov 9 20:19:58 2013
@@ -62,14 +62,14 @@ public class FindBusinessByTModelKeyQuer
public static List<?> select(EntityManager em, FindQualifiers fq,
TModelBag tModels, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
- if ((keysIn != null) && (keysIn.size() == 0))
+ if ((keysIn != null) && (keysIn.isEmpty()))
return keysIn;
if (tModels == null)
return keysIn;
List<String> tmodelKeys = tModels.getTModelKey();
- if (tmodelKeys == null || tmodelKeys.size() == 0)
+ if (tmodelKeys == null || tmodelKeys.isEmpty())
return keysIn;
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
@@ -125,7 +125,7 @@ public class FindBusinessByTModelKeyQuer
qry.comma().pad().append(BusinessServiceQuery.ENTITY_NAME + " " +
BusinessServiceQuery.ENTITY_ALIAS).pad();
qry.comma().pad().append(BindingTemplateQuery.ENTITY_NAME + " " +
BindingTemplateQuery.ENTITY_ALIAS).pad();
- StringBuffer thetaJoins = new StringBuffer(200);
+ StringBuilder thetaJoins = new StringBuilder(200);
int tblCount = 0;
for(int count = 0; count < tmodelKeys.size(); count++) {
if (count != 0) {
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByCategoryQuery.java
Sat Nov 9 20:19:58 2013
@@ -134,7 +134,7 @@ public class FindEntityByCategoryQuery e
if (elem instanceof KeyedReference)
keyedRefs.add((KeyedReference)elem);
}
- if (keyedRefs.size() == 0)
+ if (keyedRefs.isEmpty())
return keysIn;
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindEntityByPublisherQuery.java
Sat Nov 9 20:19:58 2013
@@ -47,8 +47,8 @@ public class FindEntityByPublisherQuery
this.keyName = keyName;
this.signaturePresent = signaturePresent;
- StringBuffer sql = new StringBuffer(200);
- sql.append("select distinct " + entityAlias + "." + keyName + "
from " + entityName + " " + entityAlias + " ");
+ StringBuilder sql = new StringBuilder(200);
+ sql.append("select distinct
").append(entityAlias).append(".").append(keyName).append(" from
").append(entityName).append(" ").append(entityAlias).append(" ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindPublisherAssertionByBusinessQuery.java
Sat Nov 9 20:19:58 2013
@@ -40,7 +40,7 @@ public class FindPublisherAssertionByBus
@SuppressWarnings("unchecked")
public static List<PublisherAssertion> select(EntityManager em, List<?>
businessKeys, CompletionStatus completionStatus) {
- if ((businessKeys == null) || (businessKeys.size() == 0))
+ if ((businessKeys == null) || (businessKeys.isEmpty()))
return null;
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindServiceByTModelKeyQuery.java
Sat Nov 9 20:19:58 2013
@@ -64,14 +64,14 @@ public class FindServiceByTModelKeyQuery
public static List<?> select(EntityManager em, FindQualifiers fq,
TModelBag tModels, String parentKey, List<?> keysIn, DynamicQuery.Parameter...
restrictions) {
// If keysIn is not null and empty, then search is over.
- if ((keysIn != null) && (keysIn.size() == 0))
+ if ((keysIn != null) && (keysIn.isEmpty()))
return keysIn;
if (tModels == null)
return keysIn;
List<String> tmodelKeys = tModels.getTModelKey();
- if (tmodelKeys == null || tmodelKeys.size() == 0)
+ if (tmodelKeys == null || tmodelKeys.isEmpty())
return keysIn;
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
@@ -129,20 +129,20 @@ public class FindServiceByTModelKeyQuery
if (tmodelKeys != null && tmodelKeys.size() > 0) {
qry.comma().pad().append(BindingTemplateQuery.ENTITY_NAME + " " +
BindingTemplateQuery.ENTITY_ALIAS).pad();
- StringBuffer thetaJoins = new StringBuffer(200);
+ StringBuilder thetaJoins = new StringBuilder(200);
int tblCount = 0;
for(int count = 0; count < tmodelKeys.size(); count++) {
if (count != 0) {
if (!fq.isOrAllKeys()) {
tblCount++;
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild +
tblCount).pad();
-
thetaJoins.append(entityAliasChild + (tblCount - 1) + "." +
BindingTemplateQuery.ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " = "
+ entityAliasChild + tblCount + "." + BindingTemplateQuery.ENTITY_FIELD + "." +
BindingTemplateQuery.KEY_NAME + " ");
+
thetaJoins.append(entityAliasChild).append(tblCount - 1).append("." +
BindingTemplateQuery.ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " =
").append(entityAliasChild).append(tblCount).append("." +
BindingTemplateQuery.ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
else {
qry.comma().pad().append(ENTITY_NAME_CHILD + " " + entityAliasChild +
tblCount).pad();
-
thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." +
BindingTemplateQuery.KEY_NAME + " = " + entityAliasChild + tblCount + "." +
BindingTemplateQuery.ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
+
thetaJoins.append(BindingTemplateQuery.ENTITY_ALIAS + "." +
BindingTemplateQuery.KEY_NAME + " =
").append(entityAliasChild).append(tblCount).append("." +
BindingTemplateQuery.ENTITY_FIELD + "." + BindingTemplateQuery.KEY_NAME + " ");
thetaJoins.append(DynamicQuery.OPERATOR_AND + " ");
}
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/FindTModelByNameQuery.java
Sat Nov 9 20:19:58 2013
@@ -53,7 +53,7 @@ public class FindTModelByNameQuery exten
public static List<?> select(EntityManager em, FindQualifiers fq, Name
name, List<?> keysIn, DynamicQuery.Parameter... restrictions) {
// If keysIn is not null and empty, then search is over.
- if ((keysIn != null) && (keysIn.size() == 0))
+ if ((keysIn != null) && (keysIn.isEmpty()))
return keysIn;
if (name == null)
@@ -62,7 +62,7 @@ public class FindTModelByNameQuery exten
DynamicQuery dynamicQry = new DynamicQuery(selectSQL);
appendConditions(dynamicQry, fq, name);
// Since this is a tModel, don't need to search the lazily
deleted ones.
- dynamicQry.AND().pad().appendGroupedAnd(new
DynamicQuery.Parameter(ENTITY_ALIAS + ".deleted", new Boolean(false),
DynamicQuery.PREDICATE_EQUALS));
+ dynamicQry.AND().pad().appendGroupedAnd(new
DynamicQuery.Parameter(ENTITY_ALIAS + ".deleted", false,
DynamicQuery.PREDICATE_EQUALS));
if (restrictions != null && restrictions.length > 0)
dynamicQry.AND().pad().appendGroupedAnd(restrictions);
@@ -71,7 +71,7 @@ public class FindTModelByNameQuery exten
public static void appendConditions(DynamicQuery qry, FindQualifiers
fq, Name name) {
String namePredicate = DynamicQuery.PREDICATE_EQUALS;
- if (fq.isApproximateMatch()) {
+ if (fq!=null && fq.isApproximateMatch()) {
namePredicate = DynamicQuery.PREDICATE_LIKE;
}
@@ -79,7 +79,7 @@ public class FindTModelByNameQuery exten
String nameTerm = ENTITY_ALIAS + ".name";
String nameValue = name.getValue();
- if (fq.isCaseInsensitiveMatch()) {
+ if (fq!=null && fq.isCaseInsensitiveMatch()) {
nameTerm = "upper(" + ENTITY_ALIAS + ".name)";
nameValue = name.getValue().toUpperCase();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/PublisherAssertionQuery.java
Sat Nov 9 20:19:58 2013
@@ -31,13 +31,13 @@ public class PublisherAssertionQuery ext
protected static String deleteSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select distinct " + ENTITY_ALIAS + " from " +
ENTITY_NAME + " " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("delete from " + ENTITY_NAME + " " + ENTITY_ALIAS +
" ");
deleteSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/SubscriptionQuery.java
Sat Nov 9 20:19:58 2013
@@ -28,7 +28,7 @@ public class SubscriptionQuery extends E
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select "+ ENTITY_ALIAS + " from " + ENTITY_NAME + "
" + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
(original)
+++
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/query/TModelQuery.java
Sat Nov 9 20:19:58 2013
@@ -30,7 +30,7 @@ public class TModelQuery extends EntityQ
protected static String selectSQL;
static {
- StringBuffer sql = new StringBuffer(200);
+ StringBuilder sql = new StringBuilder(200);
sql.append("select distinct "+ ENTITY_ALIAS + "." + KEY_NAME +
" from " + ENTITY_NAME + " " + ENTITY_ALIAS + " ");
selectSQL = sql.toString();
}
Modified:
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java?rev=1540387&r1=1540386&r2=1540387&view=diff
==============================================================================
---
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
(original)
+++
juddi/trunk/juddi-examples/more-uddi-samples/src/main/java/org/apache/juddi/samples/UddiFindEndpoints.java
Sat Nov 9 20:19:58 2013
@@ -24,6 +24,7 @@ import java.util.logging.Level;
import java.util.logging.Logger;
import javax.wsdl.Definition;
import org.apache.juddi.api_v3.AccessPointType;
+import org.apache.juddi.v3.client.config.UDDIClerk;
import org.apache.juddi.v3.client.config.UDDIClient;
import org.apache.juddi.v3.client.config.UDDIClientContainer;
import org.apache.juddi.v3.client.mapping.ReadWSDL;
@@ -45,6 +46,7 @@ public class UddiFindEndpoints {
private static UDDISecurityPortType security = null;
private static UDDIInquiryPortType inquiry = null;
+ static UDDIClerk clerk = null;
public UddiFindEndpoints() {
try {
@@ -53,6 +55,7 @@ public class UddiFindEndpoints {
UDDIClient clerkManager = new
UDDIClient("META-INF/simple-publish-uddi.xml");
// register the clerkManager with the client side container
UDDIClientContainer.addClient(clerkManager);
+ clerk = clerkManager.getClerk("default");
// a ClerkManager can be a client to multiple UDDI nodes, so
// supply the nodeName (defined in your uddi.xml.
// The transport can be WS, inVM, RMI etc which is defined in the
uddi.xml
@@ -67,32 +70,15 @@ public class UddiFindEndpoints {
public void find() {
try {
- // Setting up the values to get an authentication token for the
'root' user ('root' user has admin privileges
- // and can save other publishers).
- GetAuthToken getAuthTokenRoot = new GetAuthToken();
- getAuthTokenRoot.setUserID("root");
- getAuthTokenRoot.setCred("root");
-
- // Making API call that retrieves the authentication token for the
'root' user.
- AuthToken rootAuthToken = security.getAuthToken(getAuthTokenRoot);
- System.out.println("root AUTHTOKEN = " +
rootAuthToken.getAuthInfo());
-
- GetServiceDetail fs = new GetServiceDetail();
- fs.setAuthInfo(rootAuthToken.getAuthInfo());
//TODO Key! insert your key here!
String key = "uddi:juddi.apache.org:services-inquiry";
- fs.getServiceKey().add(key);
- ServiceDetail serviceDetail = inquiry.getServiceDetail(fs);
- if (serviceDetail == null ||
serviceDetail.getBusinessService().isEmpty()) {
- System.out.println(key + " is not registered");
- } else {
- List<String> endpoints = GetEndpoints(serviceDetail,
rootAuthToken.getAuthInfo());
- for (int i = 0; i < endpoints.size(); i++) {
- System.out.println(endpoints.get(i));
- }
+ List<String> endpoints = clerk.getEndpoints(key);
+ for (int i = 0; i < endpoints.size(); i++) {
+ System.out.println(endpoints.get(i));
}
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -102,105 +88,4 @@ public class UddiFindEndpoints {
UddiFindEndpoints sp = new UddiFindEndpoints();
sp.find();
}
-
- private List<String> GetEndpoints(ServiceDetail serviceDetail, String
authInfo) throws Exception {
- List<String> items = new ArrayList<String>();
- if (serviceDetail == null) {
- return items;
- }
- for (int i = 0; i < serviceDetail.getBusinessService().size(); i++) {
- if
(serviceDetail.getBusinessService().get(i).getBindingTemplates() != null) {
- for (int k = 0; k <
serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size();
k++) {
-
items.addAll(ParseBinding(serviceDetail.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k),
authInfo));
- }
- }
- }
- return items;
- }
-
- private List<String> GetBindingInfo(String value, String cred) throws
Exception {
- List<String> items = new ArrayList<String>();
- if (value == null) {
- return items;
- }
- GetBindingDetail b = new GetBindingDetail();
- b.setAuthInfo(cred);
- b.getBindingKey().add(value);
- BindingDetail bindingDetail = inquiry.getBindingDetail(b);
- for (int i = 0; i < bindingDetail.getBindingTemplate().size(); i++) {
-
items.addAll(ParseBinding(bindingDetail.getBindingTemplate().get(i), cred));
- }
- return items;
- }
-
- private List<String> FetchWSDL(String value) {
- List<String> items = new ArrayList<String>();
-
- if (value.startsWith("http://";) || value.startsWith("https://";)) {
- //here, we need an HTTP Get for WSDLs
- org.apache.juddi.v3.client.mapping.ReadWSDL r = new ReadWSDL();
- r.setIgnoreSSLErrors(true);
- try {
- Definition wsdlDefinition = r.readWSDL(new URL(value));
- Properties properties = new Properties();
-
-
- properties.put("keyDomain", "domain");
- properties.put("businessName", "biz");
- properties.put("serverName", "localhost");
- properties.put("serverPort", "80");
-
- WSDL2UDDI wsdl2UDDI = new WSDL2UDDI(null, new
URLLocalizerDefaultImpl(), properties);
- BusinessServices businessServices =
wsdl2UDDI.createBusinessServices(wsdlDefinition);
- for (int i = 0; i <
businessServices.getBusinessService().size(); i++) {
- if
(businessServices.getBusinessService().get(i).getBindingTemplates() != null) {
- for (int k = 0; k <
businessServices.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().size();
k++) {
-
items.addAll(ParseBinding(businessServices.getBusinessService().get(i).getBindingTemplates().getBindingTemplate().get(k),
null));
- }
- }
- }
- } catch (Exception ex) {
-
Logger.getLogger(UddiFindEndpoints.class.getName()).log(Level.SEVERE, null, ex);
- }
-
- }
- return items;
- }
-
- private List<String> ParseBinding(BindingTemplate get, String authInfo)
throws Exception {
- List<String> items = new ArrayList<String>();
- if (get == null || get.getAccessPoint() == null) {
- return items;
- }
- if (get.getHostingRedirector() != null) {
- //hosting Redirector is the same as "reference this other binding
template". It's actually deprecated so
- //don't expect to see this too often
-
items.addAll(GetBindingInfo(get.getHostingRedirector().getBindingKey(),
authInfo));
- }
- if (get.getAccessPoint() != null) {
- String usetype = get.getAccessPoint().getUseType();
- if (usetype == null) {
- //this is unexpected, usetype is a required field
- items.add(get.getAccessPoint().getValue());
- } else if
(usetype.equalsIgnoreCase(AccessPointType.BINDING_TEMPLATE.toString())) {
- //referencing another binding template
- items.addAll(GetBindingInfo(get.getAccessPoint().getValue(),
authInfo));
- } else if
(usetype.equalsIgnoreCase(AccessPointType.HOSTING_REDIRECTOR.toString())) {
- //this one is a bit strange. the value should be a binding
template
-
- items.addAll(GetBindingInfo(get.getAccessPoint().getValue(),
authInfo));
-
- } else if
(usetype.equalsIgnoreCase(AccessPointType.WSDL_DEPLOYMENT.toString())) {
- //fetch wsdl and parse
- items.addAll(FetchWSDL(get.getAccessPoint().getValue()));
- } else if
(usetype.equalsIgnoreCase(AccessPointType.END_POINT.toString())) {
- items.add(get.getAccessPoint().getValue());
- } else {
- //treat it has an extension or whatever
- items.add(get.getAccessPoint().getValue());
- }
-
- }
- return items;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
