Author: joehni
Date: Tue Feb 7 13:14:22 2006
New Revision: 375711
URL: http://svn.apache.org/viewcvs?rev=375711&view=rev
Log:
Coverage for UUIDTask.
Modified:
jakarta/commons/sandbox/id/trunk/src/java/org/apache/commons/id/uuid/task/UUIDTask.java
jakarta/commons/sandbox/id/trunk/src/test/org/apache/commons/id/serial/TimeBasedAlphanumericIdentifierGeneratorTest.java
Modified:
jakarta/commons/sandbox/id/trunk/src/java/org/apache/commons/id/uuid/task/UUIDTask.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/id/trunk/src/java/org/apache/commons/id/uuid/task/UUIDTask.java?rev=375711&r1=375710&r2=375711&view=diff
==============================================================================
---
jakarta/commons/sandbox/id/trunk/src/java/org/apache/commons/id/uuid/task/UUIDTask.java
(original)
+++
jakarta/commons/sandbox/id/trunk/src/java/org/apache/commons/id/uuid/task/UUIDTask.java
Tue Feb 7 13:14:22 2006
@@ -21,78 +21,98 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.EnumeratedAttribute;
+
/**
* Simple Ant task to generate a UUID. See the following Ant script for usage:
- * <pre>
- * <project default="generate.uuid" name="uuid" basedir=".">
- *
- * <taskdef name="uuid"
className="org.apache.commons.id.uuid.task.UUIDTask"/>
*
- * <target name="generate.uuid" description="Generates a UUID">
- * <uuid version="VERSION_ONE"/>
- * <echo message="${uuid}"/>
- * <uuid version="VERSION_THREE"/>
- * <echo message="${uuid}"/>
- * <uuid version="VERSION_FOUR"/>
- * <echo message="${uuid}"/>
- * <uuid version="VERSION_FIVE"/>
- * <echo message="${uuid}"/>
- * </target>
- * </project>
+ * <pre>
+ * <project default="generate.uuid" name="uuid"
basedir=".">
+ *
+ * <taskdef name="uuid"
className="org.apache.commons.id.uuid.task.UUIDTask"/>
+ *
+ * <target name="generate.uuid" description="Generates a
UUID">
+ * <uuid version="VERSION_ONE"/>
+ * <echo message="${uuid}"/>
+ * <uuid version="VERSION_THREE"/>
+ * <echo message="${uuid}"/>
+ * <uuid version="VERSION_FOUR"/>
+ * <echo message="${uuid}"/>
+ * <uuid version="VERSION_FIVE"/>
+ * <echo message="${uuid}"/>
+ * </target>
+ * </project>
* </pre>
+ *
* The namespace <em>urn:uuid:B4F00409-CEF8-4822-802C-DEB20704C365</em> and
the name
- * <em>www.apache.org</em> is used to generate the UUIDs for version 3 and 5.
- * $Id$
+ * <em>www.apache.org</em> is used as default to generate the UUIDs for
version 3 and 5.
+ *
+ * @version $Id$
* @since 1.0
*/
public class UUIDTask extends Task {
-
- private String uuidVersion = "VERSION_FOUR";
- private String name = "www.apache.org";
- private String namespace =
"urn:uuid:B4F00409-CEF8-4822-802C-DEB20704C365";
-
- public void setName(String name) {
- this.name = name;
- }
-
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- /**
- * The enum for the UUID version.
- * @since 1.0
- */
- public static class UUIDVersion extends EnumeratedAttribute {
- public String[] getValues() {
- return new String[] { "VERSION_ONE", "VERSION_THREE",
"VERSION_FOUR", "VERSION_FIVE" };
- }
- }
-
- public void setVersion(UUIDVersion newVersion) {
- uuidVersion = newVersion.getValue();
- }
-
- public void execute() throws BuildException {
- UUID uuid = null;
- if (uuidVersion.equals("VERSION_THREE")) {
- uuid = UUID.nameUUIDFromString(name, new
UUID(namespace), UUID.MD5_ENCODING);
- }
- else if (uuidVersion.equals("VERSION_FIVE")) {
- uuid = UUID.nameUUIDFromString(name, new
UUID(namespace), UUID.SHA1_ENCODING);
- }
- else if (uuidVersion.equals("VERSION_FOUR")) {
- uuid = UUID.randomUUID();
- }
- else if (uuidVersion.equals("VERSION_ONE")) {
- uuid = UUID.timeUUID();
- }
-
- setProperty("uuid", uuid.toString());
- }
-
- private void setProperty(String name, String value) {
+
+ private String uuidVersion = "VERSION_FOUR";
+ private String name = "www.apache.org";
+ private String namespace = "urn:uuid:B4F00409-CEF8-4822-802C-DEB20704C365";
+
+ /**
+ * Setter for the name used to generate a UUID version 3 or 5.
+ *
+ * @param name the name ot use
+ * @since 1.0
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Setter for the namespace used to generate a UUID version 3 or 5.
+ *
+ * @param namespace the name ot use
+ * @since 1.0
+ */
+ public void setNamespace(String namespace) {
+ this.namespace = namespace;
+ }
+
+ /**
+ * The enum for the UUID version.
+ *
+ * @since 1.0
+ */
+ public static class UUIDVersion extends EnumeratedAttribute {
+ public String[] getValues() {
+ return new String[]{"VERSION_ONE", "VERSION_THREE",
"VERSION_FOUR", "VERSION_FIVE"};
+ }
+ }
+
+ /**
+ * Set the UUID version to generate.
+ *
+ * @param newVersion the UUID version
+ * @since 1.0
+ */
+ public void setVersion(UUIDVersion newVersion) {
+ uuidVersion = newVersion.getValue();
+ }
+
+ public void execute() throws BuildException {
+ UUID uuid = null;
+ if (uuidVersion.equals("VERSION_THREE")) {
+ uuid = UUID.nameUUIDFromString(name, new UUID(namespace),
UUID.MD5_ENCODING);
+ } else if (uuidVersion.equals("VERSION_FIVE")) {
+ uuid = UUID.nameUUIDFromString(name, new UUID(namespace),
UUID.SHA1_ENCODING);
+ } else if (uuidVersion.equals("VERSION_FOUR")) {
+ uuid = UUID.randomUUID();
+ } else if (uuidVersion.equals("VERSION_ONE")) {
+ uuid = UUID.timeUUID();
+ }
+
+ setProperty("uuid", uuid.toString());
+ }
+
+ private void setProperty(String name, String value) {
getProject().setProperty(name, value);
}
-
+
}
Modified:
jakarta/commons/sandbox/id/trunk/src/test/org/apache/commons/id/serial/TimeBasedAlphanumericIdentifierGeneratorTest.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/id/trunk/src/test/org/apache/commons/id/serial/TimeBasedAlphanumericIdentifierGeneratorTest.java?rev=375711&r1=375710&r2=375711&view=diff
==============================================================================
---
jakarta/commons/sandbox/id/trunk/src/test/org/apache/commons/id/serial/TimeBasedAlphanumericIdentifierGeneratorTest.java
(original)
+++
jakarta/commons/sandbox/id/trunk/src/test/org/apache/commons/id/serial/TimeBasedAlphanumericIdentifierGeneratorTest.java
Tue Feb 7 13:14:22 2006
@@ -35,9 +35,7 @@
/**
- * @author Commons-Uid team
- * @version $Id: TimeBasedAlphanumericIdentifierGeneratorTest.java 368918
2006-01-13 23:24:41Z
- * joehni $
+ * @author Commons-Id team
*/
public class TimeBasedAlphanumericIdentifierGeneratorTest extends TestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]