You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by al...@apache.org on 2017/10/08 19:55:31 UTC
[2/5] juddi git commit: JUDDI-977 findbugs
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
index 92ef637..fcb1fd8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
@@ -41,6 +41,7 @@ import javax.persistence.Query;
import javax.xml.bind.JAXB;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.ws.BindingProvider;
+import static org.apache.juddi.api.impl.AuthenticatedService.getNode;
import org.apache.juddi.api.util.QueryStatus;
import org.apache.juddi.api.util.ReplicationQuery;
import org.apache.juddi.config.AppConfig;
@@ -118,8 +119,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
queue = new ConcurrentLinkedQueue<NotifyChangeRecordsAvailable>();
}
for (String s : addedNodes) {
- if (!s.equals(node)) {
- logger.info("This node: " + node + ". New replication node queue for synchronization: " + s);
+ if (!s.equals(getNode())) {
+ logger.info("This node: " + getNode() + ". New replication node queue for synchronization: " + s);
HighWaterMarkVectorType highWaterMarkVectorType = new HighWaterMarkVectorType();
highWaterMarkVectorType.getHighWaterMark().add(new ChangeRecordIDType(s, 0L));
queue.add(new NotifyChangeRecordsAvailable(s, highWaterMarkVectorType));
@@ -187,15 +188,16 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
} catch (Exception ex) {
logger.warn("Config error!", ex);
}
- if (pub == null) {
- pub = new UDDIPublicationImpl();
- }
+
serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
- Init();
+ init();
}
- private synchronized void Init() {
+ private synchronized void init() {
+ if (pub == null) {
+ pub = new UDDIPublicationImpl();
+ }
if (queue == null) {
queue = new ConcurrentLinkedQueue<NotifyChangeRecordsAvailable>();
}
@@ -203,17 +205,6 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
- private boolean Excluded(HighWaterMarkVectorType changesAlreadySeen, ChangeRecord r) {
- if (changesAlreadySeen != null) {
- for (int i = 0; i < changesAlreadySeen.getHighWaterMark().size(); i++) {
- if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(r.getChangeID().getNodeID())
- && changesAlreadySeen.getHighWaterMark().get(i).getOriginatingUSN().equals(r.getChangeID().getOriginatingUSN())) {
- return true;
- }
- }
- }
- return false;
- }
/**
* handles when a remote node tells me that there's an update(s)
@@ -243,7 +234,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
//ok someone told me there's a change available
while (!queue.isEmpty()) {
NotifyChangeRecordsAvailable poll = queue.poll();
- if (poll != null && !poll.getNotifyingNode().equalsIgnoreCase(node)) {
+ if (poll != null && !poll.getNotifyingNode().equalsIgnoreCase(getNode())) {
UDDIReplicationPortType replicationClient = getReplicationClient(poll.getNotifyingNode());
if (replicationClient == null) {
logger.fatal("unable to obtain a replication client to node " + poll);
@@ -265,13 +256,13 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
logger.info("i've already hit the node " + poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID() + " this cycle, skipping");
break;
}
- if (poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID().equalsIgnoreCase(node)) {
- logger.info("ignoring updates that were generated here " + poll.getChangesAvailable().getHighWaterMark().get(xx).getOriginatingUSN() + " sent by " + poll.getNotifyingNode() + " this node is " + node);
+ if (poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID().equalsIgnoreCase(getNode())) {
+ logger.info("ignoring updates that were generated here " + poll.getChangesAvailable().getHighWaterMark().get(xx).getOriginatingUSN() + " sent by " + poll.getNotifyingNode() + " this node is " + getNode());
break;
}
nodesHitThisCycle.add(poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID());
GetChangeRecords body = new GetChangeRecords();
- body.setRequestingNode(node);
+ body.setRequestingNode(getNode());
body.setResponseLimitCount(BigInteger.valueOf(100L));
body.setChangesAlreadySeen(getLastChangeRecordFrom(poll.getChangesAvailable().getHighWaterMark().get(xx).getNodeID()));
@@ -295,7 +286,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
} else {
if (poll == null) {
logger.warn("strange, popped a null object");
- } else if (poll.getNotifyingNode().equalsIgnoreCase(node)) {
+ } else if (poll.getNotifyingNode().equalsIgnoreCase(getNode())) {
logger.warn("strange, popped an object from the queue but it was from myself. This probably indicates a configuration error! ignoring...first record: " + poll.getChangesAvailable().getHighWaterMark().get(0).getNodeID()+":" + poll.getChangesAvailable().getHighWaterMark().get(0).getOriginatingUSN());
}
}
@@ -320,7 +311,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
logger.debug("_______________________Remote change request " + rec.getChangeID().getNodeID() + ":" + rec.getChangeID().getOriginatingUSN());
- if (rec.getChangeID().getNodeID().equalsIgnoreCase(node)) {
+ if (rec.getChangeID().getNodeID().equalsIgnoreCase(getNode())) {
logger.info("Just received a change record that i created, ignoring....");
return;
}
@@ -374,18 +365,18 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBindingKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBindingKey())) {
//delete a binding template
UddiEntity ue = em.find(BindingTemplate.class, rec.getChangeRecordDelete().getBindingKey());
- ValidateNodeIdMisMatches(ue, node);
+ ValidateNodeIdMisMatches(ue, getNode());
pub.deleteBinding(rec.getChangeRecordDelete().getBindingKey(), em);
}
if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getBusinessKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getBusinessKey())) {
//delete a business
UddiEntity ue = em.find(BusinessEntity.class, rec.getChangeRecordDelete().getBindingKey());
- ValidateNodeIdMisMatches(ue, node);
+ ValidateNodeIdMisMatches(ue, getNode());
pub.deleteBusiness(rec.getChangeRecordDelete().getBusinessKey(), em);
}
if (rec.getChangeRecordDelete() != null && rec.getChangeRecordDelete().getServiceKey() != null && !"".equalsIgnoreCase(rec.getChangeRecordDelete().getServiceKey())) {
UddiEntity ue = em.find(BusinessService.class, rec.getChangeRecordDelete().getBindingKey());
- ValidateNodeIdMisMatches(ue, node);
+ ValidateNodeIdMisMatches(ue, getNode());
//delete a service
pub.deleteService(rec.getChangeRecordDelete().getServiceKey(), em);
}
@@ -403,7 +394,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
*/
UddiEntity tm = em.find(Tmodel.class, rec.getChangeRecordDelete().getTModelKey());
if (tm != null) {
- ValidateNodeIdMisMatches(tm, node);
+ ValidateNodeIdMisMatches(tm, getNode());
em.remove(tm);
} else {
logger.error("failed to adminstratively delete tmodel because it doesn't exist. " + rec.getChangeRecordDelete().getTModelKey());
@@ -427,7 +418,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID() == null) {
throw new Exception("Inbound replication data is missiong node id! Change will not be applied");
}
- if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equalsIgnoreCase(node)) {
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equalsIgnoreCase(getNode())) {
logger.warn("Inbound replication data is modifying locally owned data. This is not allowed, except for custody transfer");
}
if (rec.getChangeRecordNewData().getBindingTemplate() != null) {
@@ -459,8 +450,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
BusinessEntity model = em.find(org.apache.juddi.model.BusinessEntity.class, rec.getChangeRecordNewData().getBusinessEntity().getBusinessKey());
if (model != null) {
//if the owner of the new data is me, and the update didn't originate from me
- if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && !model.getNodeId().equals(node)) {
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && !model.getNodeId().equals(getNode())) {
if (model.getIsTransferInProgress()) {
//allow the transfer
MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
@@ -470,21 +461,21 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
em.merge(model);
} else {
//block it, unexpected transfer
- throw new Exception("Unexpected entity transfer to to node " + node + " from " + rec.getChangeID().getNodeID());
+ throw new Exception("Unexpected entity transfer to to node " + getNode() + " from " + rec.getChangeID().getNodeID());
}
- } else if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && model.getNodeId().equals(node)) {
+ } else if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && model.getNodeId().equals(getNode())) {
//if destination is here and it's staying here, then this is strange also
//someone else updated one of my records
throw new Exception("unexpected modification of records that this server owns, " + model.getEntityKey());
- } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && model.getNodeId().equals(node)) {
+ } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && model.getNodeId().equals(getNode())) {
//this is also strange, destination is elsewhere however it's owned by me.
throw new Exception("unexpected transfer from this node to elsewhere, possible that the key in question exists at two places prior to replication sync, " + model.getEntityKey());
- } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && !model.getNodeId().equals(node)) {
+ } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && !model.getNodeId().equals(getNode())) {
//changes on a remote node, for an existing item
MappingApiToModel.mapBusinessEntity(rec.getChangeRecordNewData().getBusinessEntity(), model);
MappingApiToModel.mapOperationalInfoIncludingChildren(model, rec.getChangeRecordNewData().getOperationalInfo());
@@ -527,8 +518,8 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
//in the case of a transfer
//if the new entity is being transfer to ME, accept and i didn't previously own it, but only if the local record is flagged as transferable
//meaning, only accept if i'm expecting a transfer
- if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && !model.getNodeId().equals(node)) {
+ if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && !model.getNodeId().equals(getNode())) {
if (model.getIsTransferInProgress()) {
//allow the transfer
em.remove(model);
@@ -542,18 +533,18 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
throw new Exception("Unexpected entity transfer to this node from " + rec.getChangeID().getNodeID());
}
- } else if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && model.getNodeId().equals(node)) {
+ } else if (rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && model.getNodeId().equals(getNode())) {
//if destination is here and it's staying here, then this is strange also
//someone else updated one of my records
throw new Exception("unexpected modification of records that this server owns, " + model.getEntityKey());
- } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && model.getNodeId().equals(node)) {
+ } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && model.getNodeId().equals(getNode())) {
//this is also strange, destination is elsewhere however it's owned by me.
throw new Exception("unexpected transfer from this node to elsewhere, possible that the key in question exists at two places prior to replication sync, " + model.getEntityKey());
- } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(node)
- && !model.getNodeId().equals(node)) {
+ } else if (!rec.getChangeRecordNewData().getOperationalInfo().getNodeID().equals(getNode())
+ && !model.getNodeId().equals(getNode())) {
//changes on a remote node, for an existing item
em.remove(model);
model = new Tmodel();
@@ -594,7 +585,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
logger.error("Unexpected delete/hide tmodel message received for non existing key " + key);
} else {
//no one else can delete/hide my tmodel
- ValidateNodeIdMisMatches(existing, node);
+ ValidateNodeIdMisMatches(existing, getNode());
existing.setDeleted(true);
existing.setModified(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
existing.setModifiedIncludingChildren(rec.getChangeRecordHide().getModified().toGregorianCalendar().getTime());
@@ -862,7 +853,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
//no edges or graph defined, default to the operator list
for (org.uddi.repl_v3.Operator o : repcfg.getOperator()) {
//no need to tell myself about a change at myself
- if (!o.getOperatorNodeID().equalsIgnoreCase(node)) {
+ if (!o.getOperatorNodeID().equalsIgnoreCase(getNode())) {
receivers.add(o.getOperatorNodeID());
}
}
@@ -872,7 +863,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
while (iterator.hasNext()) {
Edge next = iterator.next();
- if (next.getMessageReceiver().equalsIgnoreCase(node)) {
+ if (next.getMessageReceiver().equalsIgnoreCase(getNode())) {
receivers.add(next.getMessageSender());
}
@@ -924,7 +915,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
//only time this is allowed is custody transfer
if (!newNodeId.equals(currentOwningNode)) {
- logger.info("AUDIT, custody transfer from node, " + currentOwningNode + " to " + newNodeId + " current node is " + node);
+ logger.info("AUDIT, custody transfer from node, " + currentOwningNode + " to " + newNodeId + " current node is " + getNode());
//throw new Exception("node id mismatch!");
}
@@ -944,7 +935,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
* Custody and Ownership Transfer API.
*/
//so someone else attempted to update one of my records, reject it
- if (newNodeId.equals(node)) {
+ if (newNodeId.equals(getNode())) {
//throw new Exception("node id mismatch! this node already has a record for key " + newDataOperationalInfo.getEntityKey() + " and I'm the authority for it.");
}
}
@@ -1002,7 +993,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
long procTime = System.currentTimeMillis() - startTime;
serviceCounter.update(ReplicationQuery.DO_PING, QueryStatus.SUCCESS, procTime);
- return node;
+ return getNode();
}
@@ -1061,7 +1052,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
if (firstrecord == null) {
firstrecord = 0L;
}
- if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(node)) {
+ if (changesAlreadySeen.getHighWaterMark().get(i).getNodeID().equals(getNode())) {
//special case, search by database id
createQuery = em.createQuery("select e from ChangeRecord e where "
+ "(e.id > :inbound AND e.nodeID = :node) "
@@ -1073,7 +1064,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
+ "order by e.originatingUSN ASC");
}
logger.info("Query db for replication changes, lower index is " + (firstrecord) + " last index " + lastrecord + " record limit " + maxrecords);
- logger.info("This node is" + node + ", request is for data originated from " + changesAlreadySeen.getHighWaterMark().get(i).getNodeID() + " and it's being sent back to " + requestingNode);
+ logger.info("This node is" + getNode() + ", request is for data originated from " + changesAlreadySeen.getHighWaterMark().get(i).getNodeID() + " and it's being sent back to " + requestingNode);
createQuery.setMaxResults(maxrecords);
createQuery.setParameter("inbound", firstrecord);
@@ -1102,7 +1093,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
//assume that they just want records that originated from here?
logger.info("Query db for replication changes, lower index is " + (firstrecord) + " last index " + lastrecord + " record limit " + maxrecords);
- logger.info("This node is" + node + " requesting node " + requestingNode);
+ logger.info("This node is" + getNode() + " requesting node " + requestingNode);
if (lastrecord != null) {
createQuery = em.createQuery("select e from ChangeRecord e where "
@@ -1116,7 +1107,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
createQuery.setMaxResults(maxrecords);
createQuery.setParameter("inbound", firstrecord);
- createQuery.setParameter("node", node);
+ createQuery.setParameter("node", getNode());
List<org.apache.juddi.model.ChangeRecord> records = (List<org.apache.juddi.model.ChangeRecord>) createQuery.getResultList();
logger.info(records.size() + " CR records returned from query");
@@ -1134,7 +1125,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
QueryStatus.SUCCESS, procTime);
} catch (Exception ex) {
- logger.fatal("Error, this node is: " + node, ex);
+ logger.fatal("Error, this node is: " + getNode(), ex);
throw new FatalErrorException(new ErrorMessage("E_fatalError", ex.getMessage()));
} finally {
@@ -1179,7 +1170,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
Iterator<String> it = FetchEdges.getCommunicationGraph().getNode().iterator();
while (it.hasNext()) {
String nextNode = it.next();
- if (!nextNode.equals(node)) {
+ if (!nextNode.equals(getNode())) {
if (!map.containsKey(nextNode)) {
Long id = 0L;
try {
@@ -1199,12 +1190,12 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
}
//dont forget this node
Long id = (Long) em.createQuery("select (e.id) from ChangeRecord e where e.nodeID = :node order by e.id desc")
- .setParameter("node", node).setMaxResults(1).getSingleResult();
+ .setParameter("node", getNode()).setMaxResults(1).getSingleResult();
if (id == null) {
id = 0L;
}
ChangeRecordIDType x = new ChangeRecordIDType();
- x.setNodeID(node);
+ x.setNodeID(getNode());
x.setOriginatingUSN(id);
ret.add(x);
@@ -1246,7 +1237,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
//getChangeRecords from the remote node asynch
new ValidateReplication(null).validateNotifyChangeRecordsAvailable(body, ctx);
- logger.info(body.getNotifyingNode() + " just told me that there are change records available, enqueuing...size is " + queue.size() + " this node is " + node);
+ logger.info(body.getNotifyingNode() + " just told me that there are change records available, enqueuing...size is " + queue.size() + " this node is " + getNode());
//if (!queue.contains(body.getNotifyingNode())) {
queue.add(body);
//}
@@ -1315,7 +1306,7 @@ public class UDDIReplicationImpl extends AuthenticatedService implements UDDIRep
for (ChangeRecord c : executeTransfer) {
try {
c.setChangeID(new ChangeRecordIDType());
- c.getChangeID().setNodeID(node);
+ c.getChangeID().setNodeID(getNode());
c.getChangeID().setOriginatingUSN(null);
ReplicationNotifier.Enqueue(MappingApiToModel.mapChangeRecord(c));
} catch (UnsupportedEncodingException ex) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
index c516fdf..9d7a788 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetCachingImpl.java
@@ -82,6 +82,8 @@ public class UDDIValueSetCachingImpl extends AuthenticatedService implements UDD
ret.value.add(x);
}
}
+ //findbugs will flag the following as "UC_USELESS_OBJECT" when in fact
+ //it is returned as part of the service call
chunkToken = new Holder<String>();
chunkToken.value ="0";
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
index dc00628..23971f4 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIValueSetValidationImpl.java
@@ -65,7 +65,7 @@ import org.uddi.vs_v3.ValidateValues;
* From there, you need to create a class that either implements
* {@link ValueSetValidator} or extends {@link AbstractSimpleValidator}. It must
* be in the package named org.apache.juddi.validation.vsv and must by named
- * following the convention outlined in {@link #ConvertKeyToClass(java.lang.String)
+ * following the convention outlined in {@link #convertKeyToClass(java.lang.String)
* }
*
* @see ValueSetValidator
@@ -133,10 +133,10 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
Tmodel find = em.find(org.apache.juddi.model.Tmodel.class, key);
if (find != null) {
//if it is, added it to the list
- if (ContainsValidatedKey(find, UDDIConstants.IS_VALIDATED_BY)) {
+ if (containsValidatedKey(find, UDDIConstants.IS_VALIDATED_BY)) {
validators.add(key);
}
- if (ContainsValidatedKey(find, UDDIConstantsV2.IS_VALIDATED_BY)) {
+ if (containsValidatedKey(find, UDDIConstantsV2.IS_VALIDATED_BY)) {
validators.add(key);
}
}
@@ -154,7 +154,7 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
Iterator<String> iterator1 = validators.iterator();
while (iterator1.hasNext()) {
String tmodelkey = iterator1.next();
- String clazz = ConvertKeyToClass(tmodelkey);
+ String clazz = convertKeyToClass(tmodelkey);
ValueSetValidator vsv;
if (clazz == null) {
logger.info("No validator found for " + tmodelkey);
@@ -296,14 +296,14 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
return ret;
}
for (int i = 0; i < items.size(); i++) {
- validateValuesKeyRef(items.get(i).getKeyedReference());
+ ret.addAll(validateValuesKeyRef(items.get(i).getKeyedReference()));
}
return ret;
}
- public static String ConvertKeyToClass(String tmodelkey) {
+ public static String convertKeyToClass(String tmodelkey) {
if (tmodelkey == null) {
return null;
@@ -323,7 +323,7 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
public static List<String> getValidValues(String modelKey) {
try {
- ValueSetValidator vsv = (ValueSetValidator) Class.forName(ConvertKeyToClass(modelKey)).newInstance();
+ ValueSetValidator vsv = (ValueSetValidator) Class.forName(convertKeyToClass(modelKey)).newInstance();
return vsv.getValidValues();
} catch (ClassNotFoundException ex) {
} catch (InstantiationException ex) {
@@ -332,7 +332,7 @@ public class UDDIValueSetValidationImpl extends AuthenticatedService implements
return null;
}
- private boolean ContainsValidatedKey(Tmodel find, String key) {
+ private boolean containsValidatedKey(Tmodel find, String key) {
if (find.getCategoryBag() != null) {
if (find.getCategoryBag().getKeyedReferences() != null) {
for (int i = 0; i < find.getCategoryBag().getKeyedReferences().size(); i++) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java b/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
index 88e3442..126c54d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/impl/XRegisterHelper.java
@@ -134,7 +134,6 @@ public class XRegisterHelper {
log.debug("Found service with key " + existingToService.getServiceKey() + ". No need to add it again");
} else {
BusinessService fromService = uddiFromClerk.findService(bindingTemplate.getServiceKey(), fromClerk.getNode());
- fromService.getBusinessKey();
//check if the business exist
BusinessEntity existingBusinessEntity = uddiToClerk.findBusiness(fromService.getBusinessKey(), toClerk.getNode());
if (existingBusinessEntity!=null) {
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/CustodyTransferQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/CustodyTransferQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/CustodyTransferQuery.java
index 63c5691..ed03834 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/CustodyTransferQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/CustodyTransferQuery.java
@@ -59,12 +59,20 @@ public enum CustodyTransferQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
+ @Deprecated
public static CustodyTransferQuery fromQuery(final String query) {
if (_custodyTransferQueries == null) {
initCustodyTransferQueries();
}
- if (_custodyTransferQueries.contains(query)) {
+ //note: at one point this was just .contains(query) which shouldn't work
+ if (_custodyTransferQueries.containsKey(query)) {
return _custodyTransferQueries.get(query);
} else {
throw new IllegalArgumentException("Unrecognized query " + query);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/InquiryQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/InquiryQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/InquiryQuery.java
index 3e5efaf..22ed0dd 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/InquiryQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/InquiryQuery.java
@@ -73,6 +73,13 @@ public enum InquiryQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
+ @Deprecated
public static InquiryQuery fromQuery(final String query) {
if (_inquiryQueries == null) {
initInquiryQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/JUDDIQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/JUDDIQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/JUDDIQuery.java
index 7951030..e8d8f67 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/JUDDIQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/JUDDIQuery.java
@@ -102,6 +102,12 @@ public enum JUDDIQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static JUDDIQuery fromQuery(final String query) {
if (_inquiryQueries == null) {
initInquiryQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/PublicationQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/PublicationQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/PublicationQuery.java
index a255977..edc8d7f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/PublicationQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/PublicationQuery.java
@@ -82,6 +82,12 @@ public enum PublicationQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static PublicationQuery fromQuery(final String query) {
if (_publicationQueries == null) {
initPublicationQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/QueryStatus.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/QueryStatus.java b/juddi-core/src/main/java/org/apache/juddi/api/util/QueryStatus.java
index adca9c4..bf6f203 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/QueryStatus.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/QueryStatus.java
@@ -59,6 +59,12 @@ public enum QueryStatus {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static QueryStatus fromStatus(final String status) {
if (_statuses == null) {
initStatuses();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/ReplicationQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/ReplicationQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/ReplicationQuery.java
index 55d7a77..64368e7 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/ReplicationQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/ReplicationQuery.java
@@ -64,6 +64,12 @@ public enum ReplicationQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static ReplicationQuery fromQuery(final String query) {
if (_replicationQueries == null) {
initReplicationQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/SecurityQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/SecurityQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/SecurityQuery.java
index c4352f3..d2f85d1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/SecurityQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/SecurityQuery.java
@@ -58,6 +58,12 @@ public enum SecurityQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static SecurityQuery fromQuery(final String query) {
if (_securityQueries == null) {
initSecurityQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
index 4546b79..4643c6c 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
@@ -56,6 +56,13 @@ public enum SubscriptionListenerQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
+
public static SubscriptionListenerQuery fromQuery(final String query) {
if (_subscriptionListenerQueries == null) {
initSubscriptionListenerQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionQuery.java
index dee01db..b4823d1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionQuery.java
@@ -62,6 +62,12 @@ public enum SubscriptionQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static SubscriptionQuery fromQuery(final String query) {
if (_subscriptionQueries == null) {
initSubscriptionQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetCachingQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetCachingQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetCachingQuery.java
index a497137..86a9ef1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetCachingQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetCachingQuery.java
@@ -56,6 +56,12 @@ public enum ValueSetCachingQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static ValueSetCachingQuery fromQuery(final String query) {
if (_valueSetCachingQueries == null) {
initValueSetCachingQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetValidationQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetValidationQuery.java b/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetValidationQuery.java
index 34c94f3..36e706a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetValidationQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/api/util/ValueSetValidationQuery.java
@@ -55,6 +55,12 @@ public enum ValueSetValidationQuery implements UDDIQuery {
return list;
}
+ /**
+ * this doesn't appear to be used anywhere and will be removed in a future version
+ * @param query
+ * @return
+ * @deprecated
+ */
public static ValueSetValidationQuery fromQuery(final String query) {
if (_valueSetValidationQueries == null) {
initValueSetValidationQueries();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java b/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
index 131f067..d67f940 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/AppConfig.java
@@ -89,7 +89,7 @@ public class AppConfig
}
public static void saveConfiguration() throws ConfigurationException{
- Configuration configuration = getConfiguration();
+ getConfiguration(); //findbugs will flag this as useless, but its not
propConfig.save();
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/config/Install.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/config/Install.java b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
index 6b5097d..6d05519 100644
--- a/juddi-core/src/main/java/org/apache/juddi/config/Install.java
+++ b/juddi-core/src/main/java/org/apache/juddi/config/Install.java
@@ -47,6 +47,7 @@ import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.juddi.ClassUtil;
+import org.apache.juddi.api.impl.AuthenticatedService;
import org.apache.juddi.api.impl.UDDIInquiryImpl;
import org.apache.juddi.api.impl.UDDIPublicationImpl;
import org.apache.juddi.keygen.KeyGenerator;
@@ -559,12 +560,13 @@ public class Install {
if (dir.exists()) {
log.debug("Discovering the Publisher XML data files in directory: " + path);
File[] files = dir.listFiles(new PublisherFileFilter());
- for (File f : files) {
- String publisher = f.getName().substring(0, f.getName().indexOf(FILE_PUBLISHER));
- if (!rootPublisherStr.equalsIgnoreCase(publisher)) {
- publishers.add(publisher);
+ if (files!=null)
+ for (File f : files) {
+ String publisher = f.getName().substring(0, f.getName().indexOf(FILE_PUBLISHER));
+ if (!rootPublisherStr.equalsIgnoreCase(publisher)) {
+ publishers.add(publisher);
+ }
}
- }
} else {
String[] paths = {};
Enumeration<JarEntry> en = null;
@@ -644,7 +646,7 @@ public class Install {
StringBuilder xml = new StringBuilder();
byte[] b = new byte[4096];
for (int n; (n = resourceStream.read(b)) != -1;) {
- xml.append(new String(b, 0, n));
+ xml.append(new String(b, 0, n, AuthenticatedService.UTF8));
}
log.debug("inserting: " + xml.toString());
StringReader reader = new StringReader(xml.toString());
@@ -680,7 +682,7 @@ public class Install {
StringBuilder xml = new StringBuilder();
byte[] b = new byte[4096];
for (int n; (n = resourceStream.read(b)) != -1;) {
- xml.append(new String(b, 0, n));
+ xml.append(new String(b, 0, n, AuthenticatedService.UTF8));
}
log.debug("inserting: " + xml.toString());
StringReader reader = new StringReader(xml.toString());
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java b/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
index 226f625..0b8236e 100644
--- a/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
+++ b/juddi-core/src/main/java/org/apache/juddi/cryptor/CryptorFactory.java
@@ -40,7 +40,7 @@ import org.apache.juddi.v3.client.cryptor.Cryptor;
public abstract class CryptorFactory {
- private static Log log = LogFactory.getLog(CryptorFactory.class);
+ private static final Log log = LogFactory.getLog(CryptorFactory.class);
// the shared Cryptor instance
private static Cryptor cryptor = null;
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
index 419db01..aea1017 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingApiToModel.java
@@ -30,6 +30,7 @@ import javax.xml.bind.JAXBElement;
import javax.xml.transform.dom.DOMResult;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.juddi.api.impl.AuthenticatedService;
import org.apache.juddi.jaxb.JAXBMarshaller;
import org.apache.juddi.model.Address;
import org.apache.juddi.model.BindingTemplate;
@@ -976,8 +977,9 @@ public class MappingApiToModel {
/**
* note that when using this, it does not reference the instance of the
- * specific businesses, it will create new ones. be sure to overwrite them
- * with the correct references
+ * specific businesses, it will create new ones. be sure to overwrite
+ * them with the correct references
+ *
* @param apiPubAssertion
* @param modelPubAssertion
* @throws DispositionReportFaultMessage
@@ -1002,16 +1004,14 @@ public class MappingApiToModel {
modelPubAssertion.setKeyName(apiKeyedRef.getKeyName());
modelPubAssertion.setKeyValue(apiKeyedRef.getKeyValue());
}
- if (!apiPubAssertion.getSignature().isEmpty())
- {
+ if (!apiPubAssertion.getSignature().isEmpty()) {
modelPubAssertion.setSignatures(mapApiSignaturesToModelSignatures(apiPubAssertion.getSignature()));
- for (Signature s : modelPubAssertion.getSignatures())
- { s.setPublisherAssertionFromKey(modelPubAssertion.getBusinessEntityByFromKey().getEntityKey());
+ for (Signature s : modelPubAssertion.getSignatures()) {
+ s.setPublisherAssertionFromKey(modelPubAssertion.getBusinessEntityByFromKey().getEntityKey());
s.setPublisherAssertionToKey(modelPubAssertion.getBusinessEntityByToKey().getEntityKey());
-
+
}
-
-
+
}
}
@@ -1348,14 +1348,18 @@ public class MappingApiToModel {
if (xform instanceof String) {
sdv.setContentType(String.class.getSimpleName());
String xformStr = xform.toString();
- byte[] xformBytes = xformStr.getBytes();
- sdv.setContentBytes(xformBytes);
+ try {
+ byte[] xformBytes = xformStr.getBytes(AuthenticatedService.UTF8);
+ sdv.setContentBytes(xformBytes);
+ } catch (Exception e) {
+ throw new RuntimeException("Failed to encode string due to: " + e.getMessage(), e);
+ }
} else if (xform instanceof Element) {
sdv.setContentType(Element.class.getCanonicalName());
Element xformEl = (Element) xform;
String str = serializeTransformElement(xformEl);
try {
- sdv.setContentBytes(str.getBytes("UTF-8"));
+ sdv.setContentBytes(str.getBytes(AuthenticatedService.UTF8));
} catch (Exception e) {
throw new RuntimeException("Failed to encode string due to: " + e.getMessage(), e);
}
@@ -1370,7 +1374,7 @@ public class MappingApiToModel {
Element xformEl = ((Document) domResult.getNode()).getDocumentElement();
String str = serializeTransformElement(xformEl);
try {
- sdv.setContentBytes(str.getBytes("UTF-8"));
+ sdv.setContentBytes(str.getBytes(AuthenticatedService.UTF8));
} catch (Exception e) {
throw new RuntimeException("Failed to encode string due to: " + e.getMessage(), e);
}
@@ -1396,10 +1400,10 @@ public class MappingApiToModel {
org.apache.juddi.model.ChangeRecord r = new org.apache.juddi.model.ChangeRecord();
//r.setId(rec.getChangeID().getOriginatingUSN());
r.setOriginatingUSN(rec.getChangeID().getOriginatingUSN());
- if (r.getOriginatingUSN()==null){
- // logger.warn("strange, the getOriginatingUSN is null!!");
- // JAXB.marshal(rec, System.out);
- // Thread.dumpStack();
+ if (r.getOriginatingUSN() == null) {
+ // logger.warn("strange, the getOriginatingUSN is null!!");
+ // JAXB.marshal(rec, System.out);
+ // Thread.dumpStack();
}
r.setNodeID(rec.getChangeID().getNodeID());
if (rec.getChangeRecordNewData() != null) {
@@ -1442,10 +1446,10 @@ public class MappingApiToModel {
} else {
throw new UnsupportedEncodingException("unknown type!");
}
-
+
StringWriter sw = new StringWriter();
JAXB.marshal(rec, sw);
- r.setContents(sw.toString().getBytes("UTF8"));
+ r.setContents(sw.toString().getBytes(AuthenticatedService.UTF8));
return r;
}
@@ -1492,11 +1496,6 @@ public class MappingApiToModel {
}
- public static void mapSaveBindingToChangeRecord(SaveBinding recordIn, List<org.apache.juddi.model.ChangeRecord> recordsOut) {
- List<org.apache.juddi.model.ChangeRecord> r = new ArrayList<org.apache.juddi.model.ChangeRecord>();
-
- }
-
public static void mapReplicationConfiguration(ReplicationConfiguration replicationConfiguration, org.apache.juddi.model.ReplicationConfiguration model, EntityManager em) throws DispositionReportFaultMessage {
if (replicationConfiguration == null) {
throw new ValueNotAllowedException(new ErrorMessage("errors.replication.configNull"));
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
index f622097..ef5e3b5 100644
--- a/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
+++ b/juddi-core/src/main/java/org/apache/juddi/mapping/MappingModelToApi.java
@@ -1228,7 +1228,6 @@ public class MappingModelToApi {
List<SignatureType> sigs = new ArrayList<SignatureType>();
mapSignature(find.getSignatures(), sigs);
item.getSignature().addAll(sigs);
- List<Operator> ops = new ArrayList<Operator>();
mapOperator(find.getOperator(), item.getOperator());
List<org.apache.juddi.model.Contact> modelContactList = new ArrayList<org.apache.juddi.model.Contact>();
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java b/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
index 62416fa..6879dd1 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/KeyDataValue.java
@@ -16,6 +16,7 @@
package org.apache.juddi.model;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -144,7 +145,7 @@ public class KeyDataValue implements java.io.Serializable {
public String toString() {
return "KeyDataValue{" + "id=" + getId() + ", keyDataType=" + getKeyDataType() +
", keyDataName=" + getKeyDataName() + ", keyDataValueBytes="
- + getKeyDataValueBytes() + ", keyDataValueString=" + getKeyDataValueString()
+ + Arrays.toString(getKeyDataValueBytes()) + ", keyDataValueString=" + getKeyDataValueString()
+ ", keyDataValueList=" +getKeyDataValueList() + '}';
}
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
index c00269d..2d5ec2f 100644
--- a/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
+++ b/juddi-core/src/main/java/org/apache/juddi/model/PublisherAssertion.java
@@ -1,4 +1,5 @@
package org.apache.juddi.model;
+
/*
* Copyright 2001-2008 The Apache Software Foundation.
*
@@ -35,147 +36,149 @@ import javax.persistence.TemporalType;
/**
* @author <a href="mailto:kurt@apache.org">Kurt T Stam</a>
*/
- @Entity
+@Entity
@Table(name = "j3_publisher_assertion")
public class PublisherAssertion implements java.io.Serializable {
- private static final long serialVersionUID = -5285434317957104272L;
- private PublisherAssertionId id;
- private BusinessEntity businessEntityByToKey;
- private BusinessEntity businessEntityByFromKey;
- private String tmodelKey;
- private String keyName;
- private String keyValue;
- private String fromCheck;
- private String toCheck;
- private Date modified;
+ private static final long serialVersionUID = -5285434317957104272L;
+ private PublisherAssertionId id;
+ private BusinessEntity businessEntityByToKey;
+ private BusinessEntity businessEntityByFromKey;
+ private String tmodelKey;
+ private String keyName;
+ private String keyValue;
+ private String fromCheck;
+ private String toCheck;
+ private Date modified;
private List<Signature> signatures = new ArrayList<Signature>(0);
- public PublisherAssertion() {
- }
-
- public PublisherAssertion(PublisherAssertionId id,
- BusinessEntity businessEntityByToKey,
- BusinessEntity businessEntityByFromKey, String tmodelKey,
- String keyName, String keyValue, String fromCheck, String toCheck) {
- this.id = id;
- this.businessEntityByToKey = businessEntityByToKey;
- this.businessEntityByFromKey = businessEntityByFromKey;
- this.tmodelKey = tmodelKey;
- this.keyName = keyName;
- this.keyValue = keyValue;
- this.fromCheck = fromCheck;
- this.toCheck = toCheck;
- }
-
- public void setModified(Date created) {
- this.modified = created;
- }
-
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name = "modified", nullable = false, length = 29)
- public Date getModified() {
- if (modified!=null) {
- return new Date(modified.getTime());
- } else {
- return null;
- }
- }
-
- @EmbeddedId
- @AttributeOverrides({
- @AttributeOverride(name = "fromKey", column = @Column(name = "from_key", nullable = false, length = 255)),
- @AttributeOverride(name = "toKey", column = @Column(name = "to_key", nullable = false, length = 255))})
-
- public PublisherAssertionId getId() {
- return this.id;
- }
-
- public void setId(PublisherAssertionId id) {
- this.id = id;
- }
-
-
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "to_key", nullable = false, insertable = false, updatable = false)
-
- public BusinessEntity getBusinessEntityByToKey() {
- return this.businessEntityByToKey;
- }
-
- public void setBusinessEntityByToKey(BusinessEntity businessEntityByToKey) {
- this.businessEntityByToKey = businessEntityByToKey;
- }
- @ManyToOne(fetch = FetchType.LAZY)
- @JoinColumn(name = "from_key", nullable = false, insertable = false, updatable = false)
-
- public BusinessEntity getBusinessEntityByFromKey() {
- return this.businessEntityByFromKey;
- }
-
- public void setBusinessEntityByFromKey(
- BusinessEntity businessEntityByFromKey) {
- this.businessEntityByFromKey = businessEntityByFromKey;
- }
-
- @Column(name = "tmodel_key", nullable = false, length = 255)
- public String getTmodelKey() {
- return this.tmodelKey;
- }
-
- public void setTmodelKey(String tmodelKey) {
- this.tmodelKey = tmodelKey;
- }
-
- @Column(name = "key_name", nullable = false)
-
- public String getKeyName() {
- return this.keyName;
- }
-
- public void setKeyName(String keyName) {
- this.keyName = keyName;
- }
-
- @Column(name = "key_value", nullable = false)
-
- public String getKeyValue() {
- return this.keyValue;
- }
-
- public void setKeyValue(String keyValue) {
- this.keyValue = keyValue;
- }
-
- @Column(name = "from_check", nullable = false, length = 5)
- public String getFromCheck() {
- return this.fromCheck;
- }
-
- public void setFromCheck(String fromCheck) {
- this.fromCheck = fromCheck;
- }
-
- @Column(name = "to_check", nullable = false, length = 5)
- public String getToCheck() {
- return this.toCheck;
- }
-
- public void setToCheck(String toCheck) {
- this.toCheck = toCheck;
- }
-
+ public PublisherAssertion() {
+ }
+
+ public PublisherAssertion(PublisherAssertionId id,
+ BusinessEntity businessEntityByToKey,
+ BusinessEntity businessEntityByFromKey, String tmodelKey,
+ String keyName, String keyValue, String fromCheck, String toCheck) {
+ this.id = id;
+ this.businessEntityByToKey = businessEntityByToKey;
+ this.businessEntityByFromKey = businessEntityByFromKey;
+ this.tmodelKey = tmodelKey;
+ this.keyName = keyName;
+ this.keyValue = keyValue;
+ this.fromCheck = fromCheck;
+ this.toCheck = toCheck;
+ }
+
+ public void setModified(Date created) {
+ this.modified = created;
+ }
+
+ @Temporal(TemporalType.TIMESTAMP)
+ @Column(name = "modified", nullable = false, length = 29)
+ public Date getModified() {
+ if (modified != null) {
+ return new Date(modified.getTime());
+ } else {
+ return null;
+ }
+ }
+
+ @EmbeddedId
+ @AttributeOverrides({
+ @AttributeOverride(name = "fromKey", column = @Column(name = "from_key", nullable = false, length = 255)),
+ @AttributeOverride(name = "toKey", column = @Column(name = "to_key", nullable = false, length = 255))})
+ public PublisherAssertionId getId() {
+ return this.id;
+ }
+
+ public void setId(PublisherAssertionId id) {
+ this.id = id;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "to_key", nullable = false, insertable = false, updatable = false)
+
+ public BusinessEntity getBusinessEntityByToKey() {
+ return this.businessEntityByToKey;
+ }
+
+ public void setBusinessEntityByToKey(BusinessEntity businessEntityByToKey) {
+ this.businessEntityByToKey = businessEntityByToKey;
+ }
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "from_key", nullable = false, insertable = false, updatable = false)
+
+ public BusinessEntity getBusinessEntityByFromKey() {
+ return this.businessEntityByFromKey;
+ }
+
+ public void setBusinessEntityByFromKey(
+ BusinessEntity businessEntityByFromKey) {
+ this.businessEntityByFromKey = businessEntityByFromKey;
+ }
+
+ @Column(name = "tmodel_key", nullable = false, length = 255)
+ public String getTmodelKey() {
+ return this.tmodelKey;
+ }
+
+ public void setTmodelKey(String tmodelKey) {
+ this.tmodelKey = tmodelKey;
+ }
+
+ @Column(name = "key_name", nullable = false)
+
+ public String getKeyName() {
+ return this.keyName;
+ }
+
+ public void setKeyName(String keyName) {
+ this.keyName = keyName;
+ }
+
+ @Column(name = "key_value", nullable = false)
+
+ public String getKeyValue() {
+ return this.keyValue;
+ }
+
+ public void setKeyValue(String keyValue) {
+ this.keyValue = keyValue;
+ }
+
+ @Column(name = "from_check", nullable = false, length = 5)
+ public String getFromCheck() {
+ return this.fromCheck;
+ }
+
+ public void setFromCheck(String fromCheck) {
+ this.fromCheck = fromCheck;
+ }
+
+ @Column(name = "to_check", nullable = false, length = 5)
+ public String getToCheck() {
+ return this.toCheck;
+ }
+
+ public void setToCheck(String toCheck) {
+ this.toCheck = toCheck;
+ }
+
@Override
- public boolean equals(Object compareto){
- PublisherAssertion rhs = (PublisherAssertion) compareto;
- return (this.id.equals(rhs.id));
+ public boolean equals(Object compareto) {
+ if (compareto instanceof PublisherAssertion) {
+ PublisherAssertion rhs = (PublisherAssertion) compareto;
+ return (this.id.equals(rhs.id));
+ }
+ return false;
}
-
-
+
@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
public List<Signature> getSignatures() {
- if (signatures==null)
- signatures=new ArrayList<Signature>();
+ if (signatures == null) {
+ signatures = new ArrayList<Signature>();
+ }
return signatures;
}
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
index fb32e05..e43b32a 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/BindingTemplateQuery.java
@@ -31,7 +31,7 @@ public class BindingTemplateQuery extends EntityQuery {
ENTITY_ALIAS + ".businessService." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY OR " +
ENTITY_ALIAS + ".businessService.businessEntity." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY ";
- protected static String selectSQL;
+ protected final static String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
index e5acdf2..c1326ce 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/BusinessEntityQuery.java
@@ -28,7 +28,7 @@ public class BusinessEntityQuery extends EntityQuery {
public static final String ENTITY_FIELD = "businessEntity";
public static final String SIGNATURE_PRESENT = ENTITY_ALIAS + "." + SIGNATURE_FIELD + " IS NOT EMPTY ";
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
index 9d9b36e..6f3ff22 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/BusinessServiceQuery.java
@@ -30,7 +30,7 @@ public class BusinessServiceQuery extends EntityQuery {
ENTITY_ALIAS + "." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY OR " +
ENTITY_ALIAS + ".businessEntity." + EntityQuery.SIGNATURE_FIELD + " IS NOT EMPTY ";
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
index 6252dcb..2423ab7 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/DeletePublisherAssertionByBusinessQuery.java
@@ -33,7 +33,7 @@ import org.apache.juddi.query.util.DynamicQuery;
*/
public class DeletePublisherAssertionByBusinessQuery extends PublisherAssertionQuery {
- private static Log log = LogFactory.getLog(DeletePublisherAssertionByBusinessQuery.class);
+ private static final Log log = LogFactory.getLog(DeletePublisherAssertionByBusinessQuery.class);
public static int delete(EntityManager em, List<?> businessKeys) {
if ((businessKeys == null) || (businessKeys.size() == 0))
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
index 3edd064..aeb41db 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FetchBindingTemplatesQuery.java
@@ -46,9 +46,9 @@ import org.uddi.api_v3.ListDescription;
*/
public class FetchBindingTemplatesQuery extends BindingTemplateQuery {
- private static Log log = LogFactory.getLog(FetchBindingTemplatesQuery.class);
+ private static final Log log = LogFactory.getLog(FetchBindingTemplatesQuery.class);
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
index 46e0b3a..7f2ffee 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessEntitiesQuery.java
@@ -46,9 +46,9 @@ import org.uddi.api_v3.ListDescription;
*/
public class FetchBusinessEntitiesQuery extends BusinessEntityQuery {
- private static Log log = LogFactory.getLog(FetchBusinessEntitiesQuery.class);
+ private static final Log log = LogFactory.getLog(FetchBusinessEntitiesQuery.class);
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
index 5a2733c..f9ec7b8 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FetchBusinessServicesQuery.java
@@ -46,9 +46,9 @@ import org.uddi.api_v3.ListDescription;
*/
public class FetchBusinessServicesQuery extends BusinessServiceQuery {
- private static Log log = LogFactory.getLog(FetchBusinessServicesQuery.class);
+ private static final Log log = LogFactory.getLog(FetchBusinessServicesQuery.class);
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
index aed4458..d046014 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FetchTModelsQuery.java
@@ -46,9 +46,9 @@ import org.uddi.api_v3.ListDescription;
*/
public class FetchTModelsQuery extends TModelQuery {
- private static Log log = LogFactory.getLog(FetchTModelsQuery.class);
+ private static final Log log = LogFactory.getLog(FetchTModelsQuery.class);
- protected static String selectSQL;
+ protected static final String selectSQL;
static {
StringBuilder sql = new StringBuilder(200);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
index c4b8925..14fd594 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryGroupQuery.java
@@ -47,7 +47,7 @@ public class FindBindingByCategoryGroupQuery {
private static final String ENTITY_NAME_CHILD = "BindingCategoryBag";
- private static FindEntityByCategoryGroupQuery findQuery;
+ private static final FindEntityByCategoryGroupQuery findQuery;
static {
findQuery = new FindEntityByCategoryGroupQuery(BindingTemplateQuery.ENTITY_NAME,
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
index f99d9eb..6489785 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByCategoryQuery.java
@@ -41,7 +41,7 @@ public class FindBindingByCategoryQuery {
private static final String ENTITY_NAME_CHILD = "BindingCategoryBag";
- private static FindEntityByCategoryQuery findQuery;
+ private static final FindEntityByCategoryQuery findQuery;
static {
findQuery = new FindEntityByCategoryQuery(BindingTemplateQuery.ENTITY_NAME,
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
index b8d733a..7f7dfc5 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBindingByTModelKeyQuery.java
@@ -54,7 +54,7 @@ public class FindBindingByTModelKeyQuery extends BindingTemplateQuery {
public static final String ENTITY_NAME_CHILD = "TmodelInstanceInfo";
- protected static String entityAliasChild;
+ protected static final String entityAliasChild;
static {
entityAliasChild = buildAlias(ENTITY_NAME_CHILD);
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
index 29e6d45..790c127 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryGroupQuery.java
@@ -46,7 +46,7 @@ public class FindBusinessByCategoryGroupQuery {
private static final String ENTITY_NAME_CHILD = "BusinessCategoryBag";
- private static FindEntityByCategoryGroupQuery findQuery;
+ private static final FindEntityByCategoryGroupQuery findQuery;
static {
findQuery = new FindEntityByCategoryGroupQuery(BusinessEntityQuery.ENTITY_NAME,
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
index e67eb34..8c86a9d 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByCategoryQuery.java
@@ -40,7 +40,7 @@ public class FindBusinessByCategoryQuery {
private static final String ENTITY_NAME_CHILD = "BusinessCategoryBag";
- private static FindEntityByCategoryQuery findQuery;
+ private static final FindEntityByCategoryQuery findQuery;
static {
findQuery = new FindEntityByCategoryQuery(BusinessEntityQuery.ENTITY_NAME,
http://git-wip-us.apache.org/repos/asf/juddi/blob/f9e0b9d3/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
----------------------------------------------------------------------
diff --git a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
index 47f9b59..0fbf493 100644
--- a/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
+++ b/juddi-core/src/main/java/org/apache/juddi/query/FindBusinessByDiscoveryURLQuery.java
@@ -48,7 +48,7 @@ public class FindBusinessByDiscoveryURLQuery extends BusinessEntityQuery {
private static final String ENTITY_NAME_CHILD = "DiscoveryUrl";
- private static String entityAliasChild;;
+ private static final String entityAliasChild;;
static {
entityAliasChild = buildAlias(ENTITY_NAME_CHILD);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org