JUDDI-841 adding hooks to check for key generator max lengths when pulled from the publisher profile
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/8eff90e4 Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/8eff90e4 Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/8eff90e4 Branch: refs/heads/master Commit: 8eff90e467ad2ab439299c7b96ff57fdcaacf634 Parents: 2c06b73 Author: alexoree <[email protected]> Authored: Fri Feb 28 12:34:10 2014 -0500 Committer: alexoree <[email protected]> Committed: Fri Feb 28 12:34:10 2014 -0500 ---------------------------------------------------------------------- .../org/apache/juddi/keygen/DefaultKeyGenerator.java | 3 ++- .../api/impl/API_140_NegativePublicationTest.java | 13 ++----------- 2 files changed, 4 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/juddi/blob/8eff90e4/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java b/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java index 80c61d0..f6b59ca 100644 --- a/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java +++ b/juddi-core/src/main/java/org/apache/juddi/keygen/DefaultKeyGenerator.java @@ -25,6 +25,7 @@ import org.apache.commons.configuration.ConfigurationException; import org.apache.juddi.config.AppConfig; import org.apache.juddi.config.Property; import org.apache.juddi.model.UddiEntityPublisher; +import org.apache.juddi.v3.client.UDDIConstants; import org.apache.juddi.v3.error.ErrorMessage; import org.apache.juddi.v3.error.FatalErrorException; import org.uddi.v3_service.DispositionReportFaultMessage; @@ -69,7 +70,7 @@ public class DefaultKeyGenerator implements KeyGenerator { while (iter.hasNext()) { String thisDomain = iter.next(); String[] parts = thisDomain.split(":"); - if (domain == null || (2 <= parts.length && parts.length < partsMax)) { + if ((domain == null || (2 <= parts.length && parts.length < partsMax)) && thisDomain.length() + 37 < 255) { partsMax = parts.length; domain = thisDomain; } http://git-wip-us.apache.org/repos/asf/juddi/blob/8eff90e4/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java ---------------------------------------------------------------------- diff --git a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java index db5e2a6..803a1e3 100644 --- a/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java +++ b/juddi-core/src/test/java/org/apache/juddi/api/impl/API_140_NegativePublicationTest.java @@ -362,7 +362,7 @@ public class API_140_NegativePublicationTest { sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); Name n = new Name(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); + n.setValue("A Test business"); Description d = new Description(); d.setValue(str255); @@ -440,7 +440,6 @@ public class API_140_NegativePublicationTest { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); Name n = new Name(); n.setValue("A Test business"); @@ -909,7 +908,6 @@ public class API_140_NegativePublicationTest { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); Name n = new Name(); n.setValue("A Test business"); be.getName().add(n); @@ -928,7 +926,6 @@ public class API_140_NegativePublicationTest { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); Name n = new Name(); n.setValue("A Test business"); be.getName().add(n); @@ -1311,14 +1308,11 @@ public class API_140_NegativePublicationTest { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); Name n = new Name(); n.setValue("A Test business"); be.getName().add(n); be.setBusinessServices(new BusinessServices()); BusinessService bs = new BusinessService(); - bs.setBusinessKey(be.getBusinessKey()); - bs.setServiceKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); n = new Name(); n.setValue(str255); bs.getName().add(n); @@ -2041,19 +2035,16 @@ public class API_140_NegativePublicationTest { SaveBusiness sb = new SaveBusiness(); sb.setAuthInfo(authInfoJoe); BusinessEntity be = new BusinessEntity(); - be.setBusinessKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); Name n = new Name(); n.setValue("A Test business"); be.getName().add(n); be.setBusinessServices(new BusinessServices()); BusinessService bs = new BusinessService(); - bs.setServiceKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); - bs.setBusinessKey(be.getBusinessKey()); + n = new Name(); n.setValue(str255); bs.getName().add(n); BindingTemplate bt = new BindingTemplate(); - bt.setBindingKey(TckTModel.JOE_PUBLISHER_KEY_PREFIX + UUID.randomUUID().toString()); bs.setBindingTemplates(new BindingTemplates()); bt.setAccessPoint(new AccessPoint()); bt.getAccessPoint().setValue(str4096); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
