&myCustom;
\n{noformat}\n\n&myCustom; = &fo; instead of A","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"177724800","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-110/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15258","id":"15258","description":"","name":"1.5.9","archived":false,"released":true,"releaseDate":"2009-04-28"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":2,"total":2,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/86987/comment/177317","id":"177317","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"body":"see http://svn.apache.org/viewvc?rev=776696&view=rev","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"created":"2009-05-20T08:44:36.253-0500","updated":"2009-05-20T08:44:36.253-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/86987/comment/178512","id":"178512","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"body":"merge code from doxia in r8237","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"created":"2009-05-28T17:58:03.674-0500","updated":"2009-05-28T17:58:03.674-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-111.json b/jira/PLXUTILS-111.json deleted file mode 100644 index bc0c60bd..00000000 --- a/jira/PLXUTILS-111.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"87173","self":"http://jira.codehaus.org/rest/api/latest/issue/87173","key":"PLXUTILS-111","fields":{"progress":{"progress":0,"total":0},"summary":"Add copy constructor for Xpp3Dom that allows rename","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/2","id":"2","description":"A new feature of the product, which has yet to be developed.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/newfeature.png","name":"New Feature","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-111/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15318","id":"15318","description":"","name":"1.5.10","archived":false,"released":true,"releaseDate":"2009-05-29"}],"resolutiondate":"2009-05-24T11:33:30.341-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)"],"customfield_10160":null,"updated":"2009-05-24T11:33:30.336-0500","created":"2009-05-24T11:30:12.498-0500","description":"Given the name is unmodifiable, a copy constructor to specify an alternative name would be handy.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/4","iconUrl":"http://jira.codehaus.org/images/icons/priorities/minor.png","name":"Minor","id":"4"},"duedate":null,"issuelinks":[],"customfield_10163":"178070400","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-111/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15258","id":"15258","description":"","name":"1.5.9","archived":false,"released":true,"releaseDate":"2009-04-28"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/87173/comment/177857","id":"177857","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"Added in [r8215|http://fisheye.codehaus.org/changelog/plexus/?cs=8215].","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2009-05-24T11:33:30.333-0500","updated":"2009-05-24T11:33:30.333-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-112.json b/jira/PLXUTILS-112.json deleted file mode 100644 index e4d58a82..00000000 --- a/jira/PLXUTILS-112.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"50086","self":"http://jira.codehaus.org/rest/api/latest/issue/50086","key":"PLXUTILS-112","fields":{"progress":{"progress":0,"total":0},"summary":"Using plexus in maven2 causes a \"too many open files exception\"","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-112/votes","votes":1,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15318","id":"15318","description":"","name":"1.5.10","archived":false,"released":true,"releaseDate":"2009-05-29"}],"resolutiondate":"2009-05-28T16:45:58.032-0500","customfield_10210":"1.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=ivovandongen","name":"ivovandongen","emailAddress":"ivovandongen@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Ivo van Dongen","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["evenisse(evenisse)","silas1106(silas1106)","ivovandongen(ivovandongen)","rt15(rt15)"],"customfield_10160":null,"updated":"2009-05-28T23:54:37.470-0500","created":"2007-04-19T10:25:59.942-0500","description":"When building large projects we run into a problem in the last stages of a maven2 build. We've alreadye upped the OS limits on open file handles per proces and in general. I've dropped this on the continuum mailinglist at first but they pointed me in this direction.\n\nThe last part of the maven output is:\n\n[INFO] [war:war]\n[INFO] Exploding webapp...\n[INFO] Copy webapp webResources to /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT\n[INFO] Copy webapp webResources to /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT\n[INFO] Assembling webapp tesis in /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT\n[INFO] Generating war /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT.war\n[INFO] Building war: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT.war\n[INFO] ------------------------------------------------------------------------\n[ERROR] BUILD ERROR\n[INFO] ------------------------------------------------------------------------\n[INFO] Error assembling WAR: Problem creating war: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT/WEB-INF/lib/XmlSchema-1.1.jar (Too many open files)\n\n[INFO] ------------------------------------------------------------------------\n[INFO] Trace\norg.apache.maven.lifecycle.LifecycleExecutionException: Error assembling WAR: Problem creating war: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT/WEB-INF/lib/XmlSchema-1.1.jar (Too many open files)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:559)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalWithLifecycle(DefaultLifecycleExecutor.java:475)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoal(DefaultLifecycleExecutor.java:454)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoalAndHandleFailures(DefaultLifecycleExecutor.java:306)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeTaskSegments(DefaultLifecycleExecutor.java:273)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.execute(DefaultLifecycleExecutor.java:140)\nat org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:322)\nat org.apache.maven.DefaultMaven.execute(DefaultMaven.java:115)\nat org.apache.maven.cli.MavenCli.main(MavenCli.java:256)\nat sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)\nat sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)\nat sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)\nat java.lang.reflect.Method.invoke(Method.java:585)\nat org.codehaus.classworlds.Launcher.launchEnhanced(Launcher.java:315)\nat org.codehaus.classworlds.Launcher.launch(Launcher.java:255)\nat org.codehaus.classworlds.Launcher.mainWithExitCode(Launcher.java:430)\nat org.codehaus.classworlds.Launcher.main(Launcher.java:375)\nCaused by: org.apache.maven.plugin.MojoExecutionException: Error assembling WAR: Problem creating war: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT/WEB-INF/lib/XmlSchema-1.1.jar (Too many open files)\nat org.apache.maven.plugin.war.WarMojo.execute(WarMojo.java:149)\nat org.apache.maven.plugin.DefaultPluginManager.executeMojo(DefaultPluginManager.java:412)\nat org.apache.maven.lifecycle.DefaultLifecycleExecutor.executeGoals(DefaultLifecycleExecutor.java:534)\n... 16 more\nCaused by: org.codehaus.plexus.archiver.ArchiverException: Problem creating war: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT/WEB-INF/lib/XmlSchema-1.1.jar (Too many open files)\nat org.codehaus.plexus.archiver.zip.AbstractZipArchiver.createArchiveMain(AbstractZipArchiver.java:403)\nat org.codehaus.plexus.archiver.zip.AbstractZipArchiver.createArchive(AbstractZipArchiver.java:229)\nat org.apache.maven.archiver.MavenArchiver.createArchive(MavenArchiver.java:332)\nat org.apache.maven.plugin.war.WarMojo.performPackaging(WarMojo.java:183)\nat org.apache.maven.plugin.war.WarMojo.execute(WarMojo.java:133)\n... 18 more\nCaused by: java.io.FileNotFoundException: /opt/continuum-1.0.3/apps/continuum/working-directory/55/target/ROOT/WEB-INF/lib/XmlSchema-1.1.jar (Too many open files)\nat java.io.FileInputStream.open(Native Method)\nat java.io.FileInputStream.(FileInputStream.java:106)\nat org.codehaus.plexus.archiver.zip.AbstractZipArchiver.zipFile(AbstractZipArchiver.java:679)\nat org.codehaus.plexus.archiver.zip.AbstractZipArchiver.addResources(AbstractZipArchiver.java:492)\nat org.codehaus.plexus.archiver.zip.AbstractZipArchiver.createArchiveMain(AbstractZipArchiver.java:330)\n... 22 more\n[INFO] ------------------------------------------------------------------------\n[INFO] Total time: 3 minutes 54 seconds\n[INFO] Finished at: Thu Apr 19 14:26:45 CEST 2007\n[INFO] Final Memory: 106M/209M\n[INFO] --","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"177724800","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-112/watchers","watchCount":4,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=evenisse","name":"evenisse","emailAddress":"emmanuel.venisse@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Emmanuel Venisse","active":true},"attachment":[{"self":"http://jira.codehaus.org/rest/api/2/attachment/41385","id":"41385","filename":"Main.java","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=rt15","name":"rt15","emailAddress":"rt15@voila.fr","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"rt15","active":true},"created":"2009-04-16T07:43:54.401-0500","size":1864,"mimeType":"java/*","content":"http://jira.codehaus.org/secure/attachment/41385/Main.java"}],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":"debian stable","timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":4,"total":4,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/50086/comment/125646","id":"125646","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=silas1106","name":"silas1106","emailAddress":"silas1106@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Eping","active":true},"body":"Getting the same exception, but not from using the archiver:\r\n\r\n77237724 [pool-1-thread-1] INFO org.apache.maven.continuum.buildcontroller.BuildController:default - Initializing build\r\n77237736 [pool-1-thread-1] INFO org.apache.maven.continuum.buildcontroller.BuildController:default - Starting build of Smartplanner\r\n77237885 [pool-1-thread-1] INFO org.apache.maven.continuum.buildcontroller.BuildController:default - Updating working dir\r\n77237886 [pool-1-thread-1] INFO org.apache.maven.continuum.buildcontroller.BuildController:default - Performing action check-working-directory\r\n77237887 [pool-1-thread-1] INFO org.apache.maven.continuum.buildcontroller.BuildController:default - Performing action update-working-directory-from-scm\r\n77237914 [pool-1-thread-1] INFO org.apache.maven.continuum.scm.ContinuumScm:default - Updating project: id: '6', name 'aProject'.\r\n77238021 [pool-1-thread-1] INFO org.apache.maven.scm.manager.ScmManager:default - Executing: /bin/sh -c \"cd /home/build/continuum-1.1/apps/continuum/webapp/WEB-INF/working-directory/6 && svn --username build\r\ns --non-interactive update\"\r\n77238022 [pool-1-thread-1] INFO org.apache.maven.scm.manager.ScmManager:default - Working directory: /home/build/continuum-1.1/apps/continuum/webapp/WEB-INF/working-directory/6\r\n77238372 [pool-1-thread-1] ERROR org.codehaus.plexus.taskqueue.execution.TaskQueueExecutor:build-project - Error executing task\r\norg.codehaus.plexus.taskqueue.execution.TaskExecutionException: SCM error while executing 'update-working-directory-from-scm'\r\n at org.apache.maven.continuum.buildcontroller.DefaultBuildController.performAction(DefaultBuildController.java:430)\r\n at org.apache.maven.continuum.buildcontroller.DefaultBuildController.updateWorkingDirectory(DefaultBuildController.java:380)\r\n at org.apache.maven.continuum.buildcontroller.DefaultBuildController.build(DefaultBuildController.java:112)\r\n at org.apache.maven.continuum.buildcontroller.BuildProjectTaskExecutor.executeTask(BuildProjectTaskExecutor.java:50)\r\n at org.codehaus.plexus.taskqueue.execution.ThreadedTaskQueueExecutor$ExecutorRunnable$1.run(ThreadedTaskQueueExecutor.java:116)\r\n at edu.emory.mathcs.backport.java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:442)\r\n at edu.emory.mathcs.backport.java.util.concurrent.FutureTask.run(FutureTask.java:176)\r\n at edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:665)\r\n at edu.emory.mathcs.backport.java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:690)\r\n at java.lang.Thread.run(Thread.java:595)\r\nCaused by: org.apache.maven.continuum.scm.ContinuumScmException: Error while update sources.\r\n at org.apache.maven.continuum.scm.DefaultContinuumScm.updateProject(DefaultContinuumScm.java:285)\r\n at org.apache.maven.continuum.core.action.UpdateWorkingDirectoryFromScmContinuumAction.execute(UpdateWorkingDirectoryFromScmContinuumAction.java:75)\r\n at org.apache.maven.continuum.buildcontroller.DefaultBuildController.performAction(DefaultBuildController.java:408)\r\n ... 9 more\r\nCaused by: org.apache.maven.scm.ScmException: Exception while executing SCM command.\r\n at org.apache.maven.scm.command.AbstractCommand.execute(AbstractCommand.java:62)\r\n at org.apache.maven.scm.provider.svn.AbstractSvnScmProvider.executeCommand(AbstractSvnScmProvider.java:371)\r\n at org.apache.maven.scm.provider.svn.AbstractSvnScmProvider.update(AbstractSvnScmProvider.java:362)\r\n at org.apache.maven.scm.provider.AbstractScmProvider.update(AbstractScmProvider.java:931)\r\n at org.apache.maven.scm.provider.AbstractScmProvider.update(AbstractScmProvider.java:906)\r\n at org.apache.maven.scm.provider.AbstractScmProvider.update(AbstractScmProvider.java:878)\r\n at org.apache.maven.continuum.scm.DefaultContinuumScm.updateProject(DefaultContinuumScm.java:255)\r\n ... 11 more\r\nCaused by: org.apache.maven.scm.ScmException: Error while executing command.\r\n at org.apache.maven.scm.provider.svn.svnexe.command.update.SvnUpdateCommand.executeUpdateCommand(SvnUpdateCommand.java:72)\r\n at org.apache.maven.scm.command.update.AbstractUpdateCommand.executeCommand(AbstractUpdateCommand.java:62)\r\n at org.apache.maven.scm.command.AbstractCommand.execute(AbstractCommand.java:58)\r\n ... 17 more\r\nCaused by: org.codehaus.plexus.util.cli.CommandLineException: Error while executing process.\r\n at org.codehaus.plexus.util.cli.Commandline.execute(Commandline.java:652)\r\n at org.codehaus.plexus.util.cli.CommandLineUtils.executeCommandLine(CommandLineUtils.java:102)\r\n at org.codehaus.plexus.util.cli.CommandLineUtils.executeCommandLine(CommandLineUtils.java:89)\r\n at org.apache.maven.scm.provider.svn.svnexe.command.SvnCommandLineUtils.execute(SvnCommandLineUtils.java:126)\r\n at org.apache.maven.scm.provider.svn.svnexe.command.update.SvnUpdateCommand.executeUpdateCommand(SvnUpdateCommand.java:68)\r\n ... 19 more\r\nCaused by: java.io.IOException: java.io.IOException: Too many open files\r\n at java.lang.UNIXProcess.File.separatorChar, so the separator used need not match File.separatorChar.\n\nAttached is a unit test that demonstrates the problem.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"173059200","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-114/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jdcasey","name":"jdcasey","emailAddress":"jdcasey@commonjava.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"John Casey","active":true},"attachment":[{"self":"http://jira.codehaus.org/rest/api/2/attachment/43329","id":"43329","filename":"file-separators.zip","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=igorfie","name":"igorfie","emailAddress":"igor@ifedorenko.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Igor Fedorenko","active":true},"created":"2009-07-21T10:46:54.608-0500","size":3105,"mimeType":"application/x-zip","content":"http://jira.codehaus.org/secure/attachment/43329/file-separators.zip"}],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15515","id":"15515","description":"","name":"1.5.15","archived":false,"released":true,"releaseDate":"2009-06-05"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/89982/comment/184344","id":"184344","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jdcasey","name":"jdcasey","emailAddress":"jdcasey@commonjava.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"John Casey","active":true},"body":"fixed for 1.5.16","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jdcasey","name":"jdcasey","emailAddress":"jdcasey@commonjava.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"John Casey","active":true},"created":"2009-07-21T11:53:38.015-0500","updated":"2009-07-21T11:53:38.015-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}}
\ No newline at end of file
diff --git a/jira/PLXUTILS-116.json b/jira/PLXUTILS-116.json
deleted file mode 100644
index da03b638..00000000
--- a/jira/PLXUTILS-116.json
+++ /dev/null
@@ -1 +0,0 @@
-{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"91429","self":"http://jira.codehaus.org/rest/api/latest/issue/91429","key":"PLXUTILS-116","fields":{"progress":{"progress":0,"total":0},"summary":"PathTool.getRelativeFilePath gives different results on Windows and Linux","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-116/votes","votes":1,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/2","id":"2","description":"The problem described is an issue which will never be fixed.","name":"Won't Fix"},"fixVersions":[],"resolutiondate":"2014-11-25T14:48:14.251-0600","customfield_10210":"1.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["lukas(lukas)","michael-o(michael-o)"],"customfield_10160":null,"updated":"2014-11-25T14:48:14.289-0600","created":"2009-07-26T08:00:18.184-0500","description":"On windows, {noformat}PathTool.getRelativeFilePath( \"index.html\", \"c:\\\\bin\" );{noformat} returns null, on Linux, {noformat}PathTool.getRelativeFilePath( \"index.html\", \"/bin\" );{noformat} returns \"../bin\".\n\nI guess it's probably not a valid use case since both paths are supposed to be absolute, however, the fact that different results are returned has caused me much grief: MSITE-404.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[{"id":"23762","self":"http://jira.codehaus.org/rest/api/2/issueLink/23762","type":{"id":"10010","name":"Related","inward":"is related to","outward":"relates to","self":"http://jira.codehaus.org/rest/api/2/issueLinkType/10010"},"outwardIssue":{"id":"91460","key":"DOXIASITETOOLS-29","self":"http://jira.codehaus.org/rest/api/2/issue/91460","fields":{"summary":"PathUtils.getRelativePath returns different results on Windows and Linux","status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/2","iconUrl":"http://jira.codehaus.org/images/icons/priorities/critical.png","name":"Critical","id":"2"},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false}}}}],"customfield_10163":"4320000","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-116/watchers","watchCount":1,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":null,"attachment":[{"self":"http://jira.codehaus.org/rest/api/2/attachment/43419","id":"43419","filename":"PLXUTILS-116-test.patch","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"created":"2009-07-26T08:02:02.106-0500","size":1147,"mimeType":"text/x-patch","content":"http://jira.codehaus.org/secure/attachment/43419/PLXUTILS-116-test.patch"}],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15515","id":"15515","description":"","name":"1.5.15","archived":false,"released":true,"releaseDate":"2009-06-05"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":3,"total":3,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/91429/comment/184916","id":"184916","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"body":"See attached patch for test case.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"created":"2009-07-26T08:02:02.114-0500","updated":"2009-07-26T08:02:02.114-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/91429/comment/251465","id":"251465","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"body":"Just got bitten by this again, there is another difference even if both paths are absolute:\r\n{noformat}PathTool.getRelativeFilePath( \"http://maven.apache.org/doxia/\", \"http://maven.apache.org/\");{noformat}\r\nreturns \"../\" on Linux but \"..\" on windows. The missing slash is important if the result is subsequently used in a URI constructor.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=lukas","name":"lukas","emailAddress":"ltheussl@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Lukas Theussl","active":true},"created":"2011-01-13T08:08:05.101-0600","updated":"2011-01-13T08:08:05.101-0600"},{"self":"http://jira.codehaus.org/rest/api/2/issue/91429/comment/357576","id":"357576","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"body":"Please refer to https://cwiki.apache.org/confluence/display/MAVEN/The+Great+JIRA+Cleanup+of+2014 if you're wondering why this issue was closed out.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"created":"2014-11-25T14:48:14.276-0600","updated":"2014-11-25T14:48:14.276-0600"}]},"timeoriginalestimate":null,"aggregatetimespent":null}}
\ No newline at end of file
diff --git a/jira/PLXUTILS-117.json b/jira/PLXUTILS-117.json
deleted file mode 100644
index accecf86..00000000
--- a/jira/PLXUTILS-117.json
+++ /dev/null
@@ -1 +0,0 @@
-{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"96365","self":"http://jira.codehaus.org/rest/api/latest/issue/96365","key":"PLXUTILS-117","fields":{"progress":{"progress":0,"total":0},"summary":"The classes from org.codehaus.plexus.utils.interpolation are not self-contained","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-117/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/2","id":"2","description":"The problem described is an issue which will never be fixed.","name":"Won't Fix"},"fixVersions":[],"resolutiondate":"2009-09-11T16:40:02.679-0500","customfield_10210":"1.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)","siveton(siveton)"],"customfield_10160":null,"updated":"2009-09-11T16:40:37.321-0500","created":"2009-08-22T10:41:22.197-0500","description":"[r8255|http://fisheye.codehaus.org/changelog/plexus/?cs=8255] caused exclusion of the plexus-interpolation classes from the plexus-utils JAR. This in turn makes usage of the {{org.codehaus.plexus.utils.intepolation.*}} classes from a standalone plexus-utils JAR impossible as their super classes can't be resolved. See the attached demo project that fails upon \"mvn clean compile\".\n\nNote sure whether the change in the above commit was actually necessary given that previous plexus-utils versions like 1.5.12 apparently shipped with a [dependency reduced POM|http://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/1.5.12/plexus-utils-1.5.12.pom] that already declared plexus-interpolation as provided.\n\nDeclaring plexus-interpolation as provided in the original POM causes the dependency to be ignored by the Shade Plugin because that uses {{@requiresDependencyResolution runtime}} but provided dependencies are not resolved for this resolution scope...","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[{"id":"24158","self":"http://jira.codehaus.org/rest/api/2/issueLink/24158","type":{"id":"10010","name":"Related","inward":"is related to","outward":"relates to","self":"http://jira.codehaus.org/rest/api/2/issueLinkType/10010"},"inwardIssue":{"id":"97362","key":"PLXUTILS-118","self":"http://jira.codehaus.org/rest/api/2/issue/97362","fields":{"summary":"Remove deprecated interpolation classes","status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/4","iconUrl":"http://jira.codehaus.org/images/icons/priorities/minor.png","name":"Minor","id":"4"},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/task.png","name":"Task","subtask":false}}}}],"customfield_10163":"168566400","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-117/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"attachment":[{"self":"http://jira.codehaus.org/rest/api/2/attachment/43963","id":"43963","filename":"pu-vs-pi.zip","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2009-08-22T10:41:22.222-0500","size":1077,"mimeType":"application/zip","content":"http://jira.codehaus.org/secure/attachment/43963/pu-vs-pi.zip"}],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15593","id":"15593","description":"","name":"1.5.13","archived":false,"released":true,"releaseDate":"2009-06-05"},{"self":"http://jira.codehaus.org/rest/api/2/version/15594","id":"15594","description":"","name":"1.5.14","archived":false,"released":true,"releaseDate":"2009-06-05"},{"self":"http://jira.codehaus.org/rest/api/2/version/15515","id":"15515","description":"","name":"1.5.15","archived":false,"released":true,"releaseDate":"2009-06-05"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":2,"total":2,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/96365/comment/188179","id":"188179","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"body":"For the log, it is related to:\r\n[Using latest Plexus Utils in javadoc-plugin|http://maven.markmail.org/message/4ebuh6i2qfdrxbs5]","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"created":"2009-08-23T05:35:33.868-0500","updated":"2009-08-23T05:35:33.868-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/96365/comment/190664","id":"190664","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"The interpolation classes have been removed from newer versions (PLXUTILS-118), plugins will simply need to use plexus-interpolation instead.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2009-09-11T16:40:02.665-0500","updated":"2009-09-11T16:40:02.665-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}}
\ No newline at end of file
diff --git a/jira/PLXUTILS-118.json b/jira/PLXUTILS-118.json
deleted file mode 100644
index 9b6d65c3..00000000
--- a/jira/PLXUTILS-118.json
+++ /dev/null
@@ -1 +0,0 @@
-{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"97362","self":"http://jira.codehaus.org/rest/api/latest/issue/97362","key":"PLXUTILS-118","fields":{"progress":{"progress":0,"total":0},"summary":"Remove deprecated interpolation classes","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/task.png","name":"Task","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-118/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/15598","id":"15598","description":"","name":"2.0.0","archived":false,"released":true,"releaseDate":"2009-09-22"}],"resolutiondate":"2009-09-11T16:38:04.123-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)"],"customfield_10160":null,"updated":"2009-09-11T16:40:37.294-0500","created":"2009-09-11T16:36:34.586-0500","description":"plexus-interpolation has been long around and also considering the issues we had with the shading it's time to move forward.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/4","iconUrl":"http://jira.codehaus.org/images/icons/priorities/minor.png","name":"Minor","id":"4"},"duedate":null,"issuelinks":[{"id":"24158","self":"http://jira.codehaus.org/rest/api/2/issueLink/24158","type":{"id":"10010","name":"Related","inward":"is related to","outward":"relates to","self":"http://jira.codehaus.org/rest/api/2/issueLinkType/10010"},"outwardIssue":{"id":"96365","key":"PLXUTILS-117","self":"http://jira.codehaus.org/rest/api/2/issue/96365","fields":{"summary":"The classes from org.codehaus.plexus.utils.interpolation are not self-contained","status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false}}}}],"customfield_10163":"168566400","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-118/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/97362/comment/190663","id":"190663","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"Done in [r8377|http://fisheye.codehaus.org/changelog/plexus/?cs=8377].","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2009-09-11T16:38:04.112-0500","updated":"2009-09-11T16:38:04.112-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}}
\ No newline at end of file
diff --git a/jira/PLXUTILS-119.json b/jira/PLXUTILS-119.json
deleted file mode 100644
index 4be817cf..00000000
--- a/jira/PLXUTILS-119.json
+++ /dev/null
@@ -1 +0,0 @@
-{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"98424","self":"http://jira.codehaus.org/rest/api/latest/issue/98424","key":"PLXUTILS-119","fields":{"progress":{"progress":0,"total":86400,"percent":0},"summary":"org/codehaus/plexus/archiver/ArchiverException missing in plexus-archiver plugin","timetracking":{"originalEstimate":"1d","remainingEstimate":"1d","originalEstimateSeconds":86400,"remainingEstimateSeconds":86400},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-119/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/5","id":"5","description":"All attempts at reproducing this issue failed, or not enough information was available to reproduce the issue. Reading the code produces no clues as to why this behavior would occur. If more information appears later, please reopen the issue.","name":"Cannot Reproduce"},"fixVersions":[],"resolutiondate":"2010-10-28T17:54:07.082-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=mgainty","name":"mgainty","emailAddress":"mgainty@hotmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Martin Gainty","active":true},"aggregatetimeoriginalestimate":86400,"customfield_10161":["bentmann(bentmann)","mgainty(mgainty)"],"customfield_10160":null,"updated":"2010-10-28T17:54:07.164-0500","created":"2009-09-30T13:19:30.739-0500","description":"[INFO] Internal error in the plugin manager executing goal 'org.apache.maven.plugins:maven-dependency-plugin:2.1:resolve-plugins': \nUnable to load the mojo 'org.apache.maven.plugins:maven-dependency-plugin:2.1:resolve-plugins' in the plugin\n'org.apache.maven.plugins:maven-dependency-plugin'. \nA required class is missing:\n org/codehaus/plexus/archiver/ArchiverException\n\nlocate org.codehaus.plexus.archiver.ArchiverException.java\ncompile ArchiverException.java\n\r\n An build tool like maven is very nice.\r\n
\r\n{code} \r\n\r\nand in xml, we should have:\r\n{code:xml}\r\n\r\n An build tool like maven is very nice.\r\n
\r\n{code} \r\n\r\nWFYT?","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"created":"2007-08-21T21:09:08.089-0500","updated":"2007-08-21T21:09:08.089-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55261/comment/105409","id":"105409","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=maxb","name":"maxb","emailAddress":"maxb@f2s.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Max Bowsher","active":true},"body":"Afraid I have to disagree again.\r\n\r\nTTBOMK, for your comment to be correct, you need to replace \"in xml\" with \"in a particular application of xml which adds the additional restriction that tags may contain only tags *or* text, not a mixture of both\".\r\n\r\nXHTML 1.0 is an application of XML 1.0 - i.e. there is no correct XHTML 1.0 syntax that is not also correct XML 1.0.\r\n","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=maxb","name":"maxb","emailAddress":"maxb@f2s.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Max Bowsher","active":true},"created":"2007-08-22T05:36:23.722-0500","updated":"2007-08-22T05:36:23.722-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55261/comment/105410","id":"105410","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=maxb","name":"maxb","emailAddress":"maxb@f2s.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Max Bowsher","active":true},"body":"Also, \"WFYT?\" == ???","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=maxb","name":"maxb","emailAddress":"maxb@f2s.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Max Bowsher","active":true},"created":"2007-08-22T05:37:10.670-0500","updated":"2007-08-22T05:37:10.670-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-43.json b/jira/PLXUTILS-43.json deleted file mode 100644 index 10b3835c..00000000 --- a/jira/PLXUTILS-43.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"55266","self":"http://jira.codehaus.org/rest/api/latest/issue/55266","key":"PLXUTILS-43","fields":{"progress":{"progress":0,"total":0},"summary":"Review Notification for PLXUTILS","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/task.png","name":"Task","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-43/votes","votes":1,"hasVoted":false},"resolution":null,"fixVersions":[],"resolutiondate":null,"customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=siveton","name":"siveton","emailAddress":"vincent.siveton@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Vincent Siveton","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)","siveton(siveton)"],"customfield_10160":null,"updated":"2008-07-20T11:21:43.317-0500","created":"2007-08-21T07:50:51.831-0500","description":"No email is send to the reporter.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"204681600","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-43/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/1","description":"The issue is open and ready for the assignee to start work on it.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/open.png","name":"Open","id":"1"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":null,"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/55266/comment/142518","id":"142518","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"Confirming to be still an issue.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2008-07-20T11:21:43.307-0500","updated":"2008-07-20T11:21:43.307-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-44.json b/jira/PLXUTILS-44.json deleted file mode 100644 index 4c7ac46e..00000000 --- a/jira/PLXUTILS-44.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"55274","self":"http://jira.codehaus.org/rest/api/latest/issue/55274","key":"PLXUTILS-44","fields":{"progress":{"progress":0,"total":0},"summary":"Backslash is neither quoted nor escaped on Bash","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-44/votes","votes":1,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/2","id":"2","description":"The problem described is an issue which will never be fixed.","name":"Won't Fix"},"fixVersions":[],"resolutiondate":"2014-11-25T14:30:41.519-0600","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=sannies","name":"sannies","emailAddress":"Sebastian.Annies@googlemail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Sebastian Annies","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["michael-o(michael-o)","sannies(sannies)"],"customfield_10160":null,"updated":"2014-11-25T14:30:41.564-0600","created":"2007-08-21T10:32:54.314-0500","description":"The error occurs with Maven-SCM & continuum in my case. Maven-SCM creates following commandline:\n\n{{/bin/bash \\-c \"p4 -d /opt/continuum-1.1-beta-3-SNAPSHOT/apps/continuum/webapp/WEB-INF/working-directory/1 -cbackground-sojus-MavenSCM\\opt\\continuum-1.1-beta-3-SNAPSHOT\\apps\\continuum\\webapp\\WEB-INF\\working-directory\\1 sync\"}}\n\nthe \\-c argument is created by: \n\n{{Commandline command = PerforceScmProvider.createP4Command( repo, workingDirectory );}}\n{{command.createArgument().setValue( \"-c\"+ specname );}}\n\nthe specname contains backslashes. The bash then removes the backslashes in {{specname}}. Ouch! That doesn't work. I think that CommandLine (or the underlying Shell) has to deal with this case. What do you think?\n\nTo test easily type:\n{{/bin/bash \\-c \"echo a\\\\bc\"}}\nresult: abc\n\nSolution 1:\n{{/bin/bash \\-c \"echo a\\\\\\\\bc\"}}\nresult: ab\\\\c\n\nSolution 2:\n{{/bin/bash \\-c \"echo 'a\\\\bc'\"}}\nresult: ab\\\\c\n\n\n\n\n","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[{"id":"17475","self":"http://jira.codehaus.org/rest/api/2/issueLink/17475","type":{"id":"10001","name":"dependent","inward":"is depended upon by","outward":"depends upon","self":"http://jira.codehaus.org/rest/api/2/issueLinkType/10001"},"inwardIssue":{"id":"55262","key":"CONTINUUM-1402","self":"http://jira.codehaus.org/rest/api/2/issue/55262","fields":{"summary":"Syncing with Perforce on Linux/Unix/Bash fails","status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/2","iconUrl":"http://jira.codehaus.org/images/icons/priorities/critical.png","name":"Critical","id":"2"},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false}}}}],"customfield_10163":"4320000","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-44/watchers","watchCount":3,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":null,"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":"Bash / Unix","timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":3,"total":3,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/55274/comment/105337","id":"105337","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=sannies","name":"sannies","emailAddress":"Sebastian.Annies@googlemail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Sebastian Annies","active":true},"body":"Ignore the \"To test easily type:\" examples. I have difficulties with the wiki syntax:\r\n\r\nTo test easily type:\r\n/bin/bash -c \"echo a\\bc\"\r\nresult: abc\r\n\r\nSolution 1:\r\n/bin/bash -c \"echo a\\ \\bc\"\r\nresult: ab\\c\r\n\r\nSolution 2:\r\n/bin/bash -c \"echo 'a\\bc'\"\r\nresult: ab\\c","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=sannies","name":"sannies","emailAddress":"Sebastian.Annies@googlemail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Sebastian Annies","active":true},"created":"2007-08-21T10:35:38.819-0500","updated":"2007-08-21T10:35:38.819-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55274/comment/106314","id":"106314","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=sannies","name":"sannies","emailAddress":"Sebastian.Annies@googlemail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Sebastian Annies","active":true},"body":"This is a pain in the ... \r\n\r\ndepending on the shell we start the bash we have to escape differently: \r\n\r\nif the shell we start bash -c ... is not a bash (and is not using backslash (\\) as an escape character) we have to escape backslash with backslash. But if the shell we start the bash in is itself a bash we have to add three more backslashes: The first call to the bash (the call that will start bash itself) makes 4 backslashes to 2 backslashes. The bash that has be instantiated by the call will now process the arguements again and will reduce the number of backslashes to just one backslash. OUCH. I hate unix\r\n","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=sannies","name":"sannies","emailAddress":"Sebastian.Annies@googlemail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Sebastian Annies","active":true},"created":"2007-09-03T13:54:47.159-0500","updated":"2007-09-03T13:54:47.159-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55274/comment/357280","id":"357280","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"body":"Please refer to https://cwiki.apache.org/confluence/display/MAVEN/The+Great+JIRA+Cleanup+of+2014 if you're wondering why this issue was closed out.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"created":"2014-11-25T14:30:41.544-0600","updated":"2014-11-25T14:30:41.544-0600"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-45.json b/jira/PLXUTILS-45.json deleted file mode 100644 index fb7679f0..00000000 --- a/jira/PLXUTILS-45.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"55301","self":"http://jira.codehaus.org/rest/api/latest/issue/55301","key":"PLXUTILS-45","fields":{"progress":{"progress":0,"total":0},"summary":"Test methods in DirectoryScannerTest do not actually test the DirectoryScanner class","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/task.png","name":"Task","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-45/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/6","id":"6","description":"The issue is not a bug","name":"Not A Bug"},"fixVersions":[],"resolutiondate":"2008-07-20T14:03:41.485-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=wfay","name":"wfay","emailAddress":"waynefay@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Wayne Fay","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)","wfay(wfay)"],"customfield_10160":null,"updated":"2008-07-20T14:03:41.479-0500","created":"2007-08-21T20:41:27.947-0500","description":"I've been poking around in Plexus lately and patching a few JIRA issues. I thought I'd debug PLXUTILS-8 a bit so I looked at DirectoryScannerTest.java.\n\nHumorously enough, while the file is named DirectoryScannerTest, there is not a single mention of DS anywhere in the tests nor in the file itself.\n\nThis file should be renamed, or eliminated with the tests in the file moved to FileUtilsTest. Also, DS could stand to have some unit tests added, but that's another story...","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/4","iconUrl":"http://jira.codehaus.org/images/icons/priorities/minor.png","name":"Minor","id":"4"},"duedate":null,"issuelinks":[],"customfield_10163":"204681600","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-45/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/55301/comment/142533","id":"142533","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"The tests call {{FileUtils.getFiles()}} which at the end of the day boils down to the {{DirectoryScanner}}, so effectively it's doing the job.\r\n\r\nbq. Also, DS could stand to have some unit tests added, but that's another story...\r\nLet's hope the Ant guys have some, then the copy here at plexus-utils should be fine, too ;-)","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2008-07-20T14:03:41.475-0500","updated":"2008-07-20T14:03:41.475-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-46.json b/jira/PLXUTILS-46.json deleted file mode 100644 index c8d5cd7a..00000000 --- a/jira/PLXUTILS-46.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"55784","self":"http://jira.codehaus.org/rest/api/latest/issue/55784","key":"PLXUTILS-46","fields":{"progress":{"progress":0,"total":0},"summary":"NPE in DirectoryScanner.scandir with dangling NTFS junctions","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-46/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/14039","id":"14039","description":"","name":"1.3","archived":false,"released":true,"releaseDate":"2006-09-28"}],"resolutiondate":"2008-07-20T15:20:09.553-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=u_302320","name":"u_302320","emailAddress":"make@gmx.li","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Matthias Kerkhoff","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["bentmann(bentmann)","u_302320(u_302320)"],"customfield_10160":null,"updated":"2008-07-20T15:20:09.545-0500","created":"2007-09-04T05:15:21.549-0500","description":"NTFS supports symbolic links to directories, so-called junction points or junctions. It is possible to create a junction point and delete the target directory afterwards. The junction point itself continues to exist although its target does no longer exist (quite similar to unix symbolic links). \nIf a DirectoryScanner.scan() is executed with the junction point as basedir an NPE will be thrown:\n\n{noformat}\njava.lang.NullPointerException\n at org.codehaus.plexus.util.DirectoryScanner.scandir(DirectoryScanner.java:712)\n at org.codehaus.plexus.util.DirectoryScanner.scan(DirectoryScanner.java:593)\n at de.xxx.yyy.utils.FileUtil.findDirectories(FileUtil.java:315)\n{noformat}\n\nThis happens because the code in DirectoryScanner.scan does properly handle this case\n{preformat}\n if ( !basedir.exists() )\n {\n throw new IllegalStateException( \"basedir \" + basedir\n + \" does not exist\" );\n }\n{preformat}\ndoes not work for junction points with non-existing target.\n\nA possible solution might be to reactivate the initial check in DiectoryScanner.scandir() which is currently commented out.\n{preformat}\n if ( newfiles == null )\n {\n /*\n * two reasons are mentioned in the API docs for File.list\n * (1) dir is not a directory. This is impossible as\n * we wouldn't get here in this case.\n * (2) an IO error occurred (why doesn't it throw an exception\n * then???)\n */\n //throw new Exception( \"IO error scanning directory \" + dir.getAbsolutePath() );\n }\n{preformat}\n","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"204681600","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-46/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/14048","id":"14048","description":"","name":"1.0.4","archived":true,"released":true,"releaseDate":"2005-10-11"}],"customfield_10170":null,"environment":"Windows XP, NTFS, plexus-utils-1.0.4","timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":1,"total":1,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/55784/comment/142537","id":"142537","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"Already fixed since [r3569|http://fisheye.codehaus.org/changelog/plexus/?cs=3569].","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2008-07-20T15:20:09.541-0500","updated":"2008-07-20T15:20:09.541-0500"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-47.json b/jira/PLXUTILS-47.json deleted file mode 100644 index b3d9887c..00000000 --- a/jira/PLXUTILS-47.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"55898","self":"http://jira.codehaus.org/rest/api/latest/issue/55898","key":"PLXUTILS-47","fields":{"progress":{"progress":0,"total":1800,"percent":0},"summary":"FileUtils.basename( filename ) blows up due to false assumptions about inputs","timetracking":{"originalEstimate":"30m","remainingEstimate":"30m","originalEstimateSeconds":1800,"remainingEstimateSeconds":1800},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-47/votes","votes":1,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/14036","id":"14036","description":"","name":"1.5","archived":false,"released":true,"releaseDate":"2008-02-18"}],"resolutiondate":"2008-02-12T15:55:27.034-0600","customfield_10210":"1.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=skaze","name":"skaze","emailAddress":"skazer@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"John Allen","active":true},"aggregatetimeoriginalestimate":1800,"customfield_10161":["bentmann(bentmann)","jburrell(jburrell)","skaze(skaze)","olamy(olamy)"],"customfield_10160":null,"updated":"2008-02-12T15:55:26.838-0600","created":"2007-09-06T12:54:38.428-0500","description":"Can you spot the deliberate mistake?\n\n{code}\n /**\n * Returns the filename portion of a file specification string.\n * Matches the equally named unix command.\n * @return The filename string without extension.\n */\n public static String basename( String filename )\n {\n return basename( filename, extension( filename ) );\n }\n{code}\n\nSo we pass in a full filename but if it contains a DOT '.' in the path we're screwed. Why? Because extension( filename ) is naive in its implementation...\n\n{code}\n /**\n * Returns the extension portion of a file specification string.\n * This everything after the last dot '.' in the filename (NOT including\n * the dot).\n */\n public static String extension( String filename )\n {\n int lastDot = filename.lastIndexOf( '.' );\n\n if ( lastDot >= 0 )\n {\n return filename.substring( lastDot + 1 );\n }\n else\n {\n return \"\";\n }\n }\n{code}\n\nSo the search for the holy '.' does not properly stop when it meets a file separator. Instead it keeps on looking until it finds one, period.\n\nYou could argue that you're supposed to pass only a filename in BUT as basename uses it and basename is all about directories and filenames that don't hold up.\n\nSimple fix, change extension() to not be so stupid.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/2","iconUrl":"http://jira.codehaus.org/images/icons/priorities/critical.png","name":"Critical","id":"2"},"duedate":null,"issuelinks":[],"customfield_10163":"218419200","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-47/watchers","watchCount":1,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":0,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=olamy","name":"olamy","emailAddress":"olamy@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Olivier Lamy","active":true},"attachment":[{"self":"http://jira.codehaus.org/rest/api/2/attachment/29521","id":"29521","filename":"PLXUTILS-47.patch","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jburrell","name":"jburrell","emailAddress":"jamieburrell@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Jamie Burrell","active":true},"created":"2007-09-20T07:37:53.981-0500","size":7075,"mimeType":"text/plain","content":"http://jira.codehaus.org/secure/attachment/29521/PLXUTILS-47.patch"}],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":1800,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":null,"timeestimate":1800,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":1800,"percent":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":4,"total":4,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/55898/comment/107819","id":"107819","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jburrell","name":"jburrell","emailAddress":"jamieburrell@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Jamie Burrell","active":true},"body":"Patched. \r\nThere are two methods in FileUtils that do the same thing (at least that's the way it looks) - extension and getExtension. Both suffered from this issue, so I have fixed extension and pointed getExtension to it.\r\nI have also edited the (previously disabled) unit test testGetExtensionsWithPaths, as the utilities are dependent on File.separator, which varies by platform. This means that running the test on Unix against Windows paths obviously fails. These now all pass successfully.\r\n","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jburrell","name":"jburrell","emailAddress":"jamieburrell@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Jamie Burrell","active":true},"created":"2007-09-20T07:19:06.052-0500","updated":"2007-09-20T07:19:06.052-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55898/comment/107825","id":"107825","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jburrell","name":"jburrell","emailAddress":"jamieburrell@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Jamie Burrell","active":true},"body":"Apologies - just after previous patch upload, I noticed removeExtension had the same problem. That is now fixed too.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=jburrell","name":"jburrell","emailAddress":"jamieburrell@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Jamie Burrell","active":true},"created":"2007-09-20T07:37:53.991-0500","updated":"2007-09-20T07:37:53.991-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55898/comment/123298","id":"123298","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"body":"Any chances of getting this triviality fixed/released soon? I mean the patch is there...","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=bentmann","name":"bentmann","emailAddress":"benjamin.bentmann@udo.edu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Benjamin Bentmann","active":true},"created":"2008-02-11T12:48:33.644-0600","updated":"2008-02-11T12:49:02.143-0600"},{"self":"http://jira.codehaus.org/rest/api/2/issue/55898/comment/123451","id":"123451","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=olamy","name":"olamy","emailAddress":"olamy@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Olivier Lamy","active":true},"body":"fixed in rev 7197.\r\nThanks","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=olamy","name":"olamy","emailAddress":"olamy@apache.org","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Olivier Lamy","active":true},"created":"2008-02-12T15:55:26.685-0600","updated":"2008-02-12T15:55:26.685-0600"}]},"timeoriginalestimate":1800,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-48.json b/jira/PLXUTILS-48.json deleted file mode 100644 index c7285f2a..00000000 --- a/jira/PLXUTILS-48.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"56134","self":"http://jira.codehaus.org/rest/api/latest/issue/56134","key":"CONTINUUM-1447","fields":{"progress":{"progress":0,"total":0},"summary":"To fix /bin/bash issue on some platform, update plexus-utils to 1.4.6","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/3","id":"3","description":"A task that needs to be done.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/task.png","name":"Task","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/CONTINUUM-1447/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/1","id":"1","description":"A fix for this issue is checked into the tree and tested.","name":"Fixed"},"fixVersions":[{"self":"http://jira.codehaus.org/rest/api/2/version/13661","id":"13661","description":"Third Beta Release in the Continuum 1.1 series","name":"1.1-beta-3","archived":true,"released":true,"releaseDate":"2007-09-25"}],"resolutiondate":"2007-09-14T02:06:22.831-0500","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=evenisse","name":"evenisse","emailAddress":"emmanuel.venisse@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Emmanuel Venisse","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["evenisse(evenisse)"],"customfield_10160":null,"updated":"2007-09-14T02:06:22.822-0500","created":"2007-09-13T07:17:54.865-0500","description":"need a release of plexus-utils.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"231638400","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/CONTINUUM-1447/watchers","watchCount":0,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":{"self":"http://jira.codehaus.org/rest/api/2/user?username=evenisse","name":"evenisse","emailAddress":"emmanuel.venisse@gmail.com","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Emmanuel Venisse","active":true},"customfield_10221":null,"attachment":[],"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/10540","id":"10540","key":"CONTINUUM","name":"Continuum","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=10540&avatarId=10044","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=10540&avatarId=10044","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=10540&avatarId=10044","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=10540&avatarId=10044"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10008","id":"10008","description":"code quality-related","name":"quality"}},"versions":[{"self":"http://jira.codehaus.org/rest/api/2/version/13606","id":"13606","description":"Second Beta Release in the Continuum 1.1 series","name":"1.1-beta-2","archived":true,"released":true,"releaseDate":"2007-08-17"}],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":0,"total":0,"comments":[]},"customfield_10010":{"self":"http://jira.codehaus.org/rest/api/2/customFieldOption/10011","value":"Intermediate","id":"10011"},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-49.json b/jira/PLXUTILS-49.json deleted file mode 100644 index e3538d2c..00000000 --- a/jira/PLXUTILS-49.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"56703","self":"http://jira.codehaus.org/rest/api/latest/issue/56703","key":"PLXUTILS-49","fields":{"progress":{"progress":0,"total":0},"summary":"cli causes error code to be lost on windows","timetracking":{},"issuetype":{"self":"http://jira.codehaus.org/rest/api/2/issuetype/1","id":"1","description":"A problem which impairs or prevents the functions of the product.","iconUrl":"http://jira.codehaus.org/images/icons/issuetypes/bug.png","name":"Bug","subtask":false},"customfield_10110":null,"votes":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-49/votes","votes":0,"hasVoted":false},"resolution":{"self":"http://jira.codehaus.org/rest/api/2/resolution/2","id":"2","description":"The problem described is an issue which will never be fixed.","name":"Won't Fix"},"fixVersions":[],"resolutiondate":"2014-11-25T14:30:36.078-0600","customfield_10210":"0.0","timespent":null,"reporter":{"self":"http://jira.codehaus.org/rest/api/2/user?username=brianfox","name":"brianfox","emailAddress":"brianf@infinity.nu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"brianfox brianfox","active":true},"aggregatetimeoriginalestimate":null,"customfield_10161":["brianfox(brianfox)","michael-o(michael-o)"],"customfield_10160":null,"updated":"2014-11-25T14:30:36.140-0600","created":"2007-09-26T20:00:21.791-0500","description":"I'm investigating why the maven-invoker isn't detecting a failed build on windows. I see that the cli is generated as:\n{noformat}\ncmd.exe /X /C '\"\"C:\\Program Files\\maven2\\bin\\mvn.bat\" -B -X -Dmaven.repo.local=E:\\svn\\Maven\\maven-plugins\\maven-dependency-plugin\\target\\test-classes\\m2repo -Dtest=true install\"'\n{noformat}\n\nThe cmd /C part is swallowing the error code. For more info, see the linked issue.","priority":{"self":"http://jira.codehaus.org/rest/api/2/priority/3","iconUrl":"http://jira.codehaus.org/images/icons/priorities/major.png","name":"Major","id":"3"},"duedate":null,"issuelinks":[],"customfield_10163":"4320000","watches":{"self":"http://jira.codehaus.org/rest/api/2/issue/PLXUTILS-49/watchers","watchCount":1,"isWatching":false},"worklog":{"startAt":0,"maxResults":20,"total":0,"worklogs":[]},"subtasks":[],"status":{"self":"http://jira.codehaus.org/rest/api/2/status/6","description":"The issue is considered finished, the resolution is correct. Issues which are closed can be reopened.","iconUrl":"http://jira.codehaus.org/images/icons/statuses/closed.png","name":"Closed","id":"6"},"customfield_10090":null,"labels":[],"workratio":-1,"assignee":null,"attachment":[],"customfield_10221":null,"customfield_10220":null,"customfield_10200":null,"aggregatetimeestimate":null,"customfield_10190":null,"project":{"self":"http://jira.codehaus.org/rest/api/2/project/11432","id":"11432","key":"PLXUTILS","name":"Plexus Utils","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/projectavatar?size=xsmall&pid=11432&avatarId=10011","24x24":"http://jira.codehaus.org/secure/projectavatar?size=small&pid=11432&avatarId=10011","32x32":"http://jira.codehaus.org/secure/projectavatar?size=medium&pid=11432&avatarId=10011","48x48":"http://jira.codehaus.org/secure/projectavatar?pid=11432&avatarId=10011"},"projectCategory":{"self":"http://jira.codehaus.org/rest/api/2/projectCategory/10003","id":"10003","description":"various containers","name":"containers"}},"versions":[],"customfield_10170":null,"environment":null,"timeestimate":null,"customfield_10130":null,"aggregateprogress":{"progress":0,"total":0},"lastViewed":null,"components":[],"comment":{"startAt":0,"maxResults":2,"total":2,"comments":[{"self":"http://jira.codehaus.org/rest/api/2/issue/56703/comment/108386","id":"108386","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=brianfox","name":"brianfox","emailAddress":"brianf@infinity.nu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"brianfox brianfox","active":true},"body":"MNG-2127","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=brianfox","name":"brianfox","emailAddress":"brianf@infinity.nu","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"brianfox brianfox","active":true},"created":"2007-09-26T20:00:43.446-0500","updated":"2007-09-26T20:00:43.446-0500"},{"self":"http://jira.codehaus.org/rest/api/2/issue/56703/comment/357256","id":"357256","author":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"body":"Please refer to https://cwiki.apache.org/confluence/display/MAVEN/The+Great+JIRA+Cleanup+of+2014 if you're wondering why this issue was closed out.","updateAuthor":{"self":"http://jira.codehaus.org/rest/api/2/user?username=michael-o","name":"michael-o","emailAddress":"1983-01-06@gmx.net","avatarUrls":{"16x16":"http://jira.codehaus.org/secure/useravatar?size=xsmall&avatarId=10232","24x24":"http://jira.codehaus.org/secure/useravatar?size=small&avatarId=10232","32x32":"http://jira.codehaus.org/secure/useravatar?size=medium&avatarId=10232","48x48":"http://jira.codehaus.org/secure/useravatar?avatarId=10232"},"displayName":"Michael Osipov","active":true},"created":"2014-11-25T14:30:36.138-0600","updated":"2014-11-25T14:30:36.138-0600"}]},"timeoriginalestimate":null,"aggregatetimespent":null}} \ No newline at end of file diff --git a/jira/PLXUTILS-5.json b/jira/PLXUTILS-5.json deleted file mode 100644 index b134bf8c..00000000 --- a/jira/PLXUTILS-5.json +++ /dev/null @@ -1 +0,0 @@ -{"expand":"renderedFields,names,schema,transitions,operations,editmeta,changelog","id":"35108","self":"http://jira.codehaus.org/rest/api/latest/issue/35108","key":"PLXUTILS-5","fields":{"progress":{"progress":0,"total":0},"summary":"emptynull.
* @return whether or not a given path matches the start of a given pattern up to the first "**".
*/
- protected static boolean matchPatternStart( String pattern, String str )
- {
- return SelectorUtils.matchPatternStart( pattern, str );
+ protected static boolean matchPatternStart(String pattern, String str) {
+ return SelectorUtils.matchPatternStart(pattern, str);
}
/**
@@ -161,9 +181,8 @@ protected static boolean matchPatternStart( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return whether or not a given path matches the start of a given pattern up to the first "**".
*/
- protected static boolean matchPatternStart( String pattern, String str, boolean isCaseSensitive )
- {
- return SelectorUtils.matchPatternStart( pattern, str, isCaseSensitive );
+ protected static boolean matchPatternStart(String pattern, String str, boolean isCaseSensitive) {
+ return SelectorUtils.matchPatternStart(pattern, str, isCaseSensitive);
}
/**
@@ -173,9 +192,8 @@ protected static boolean matchPatternStart( String pattern, String str, boolean
* @param str The path to match, as a String. Must not be null.
* @return true if the pattern matches against the string, or false otherwise.
*/
- protected static boolean matchPath( String pattern, String str )
- {
- return SelectorUtils.matchPath( pattern, str );
+ protected static boolean matchPath(String pattern, String str) {
+ return SelectorUtils.matchPath(pattern, str);
}
/**
@@ -186,9 +204,8 @@ protected static boolean matchPath( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return true if the pattern matches against the string, or false otherwise.
*/
- protected static boolean matchPath( String pattern, String str, boolean isCaseSensitive )
- {
- return SelectorUtils.matchPath( pattern, str, isCaseSensitive );
+ protected static boolean matchPath(String pattern, String str, boolean isCaseSensitive) {
+ return SelectorUtils.matchPath(pattern, str, isCaseSensitive);
}
/**
@@ -200,9 +217,8 @@ protected static boolean matchPath( String pattern, String str, boolean isCaseSe
* @param str The string which must be matched against the pattern. Must not be null.
* @return true if the string matches against the pattern, or false otherwise.
*/
- public static boolean match( String pattern, String str )
- {
- return SelectorUtils.match( pattern, str );
+ public static boolean match(String pattern, String str) {
+ return SelectorUtils.match(pattern, str);
}
/**
@@ -215,9 +231,8 @@ public static boolean match( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return true if the string matches against the pattern, or false otherwise.
*/
- protected static boolean match( String pattern, String str, boolean isCaseSensitive )
- {
- return SelectorUtils.match( pattern, str, isCaseSensitive );
+ protected static boolean match(String pattern, String str, boolean isCaseSensitive) {
+ return SelectorUtils.match(pattern, str, isCaseSensitive);
}
/**
@@ -230,23 +245,17 @@ protected static boolean match( String pattern, String str, boolean isCaseSensit
* included. If a non-null list is given, all elements must be non-null.
*/
@Override
- public void setIncludes( String[] includes )
- {
- if ( includes == null )
- {
+ public void setIncludes(String[] includes) {
+ if (includes == null) {
this.includes = null;
- }
- else
- {
- final Listnull list is given, all elements must be non-null.
*/
@Override
- public void setExcludes( String[] excludes )
- {
- if ( excludes == null )
- {
+ public void setExcludes(String[] excludes) {
+ if (excludes == null) {
this.excludes = null;
- }
- else
- {
- final Listnull.
* @return The normalized pattern, never null.
*/
- private String normalizePattern( String pattern )
- {
+ private String normalizePattern(String pattern) {
pattern = pattern.trim();
- if ( pattern.startsWith( SelectorUtils.REGEX_HANDLER_PREFIX ) )
- {
- if ( File.separatorChar == '\\' )
- {
- pattern = StringUtils.replace( pattern, "/", "\\\\" );
+ if (pattern.startsWith(SelectorUtils.REGEX_HANDLER_PREFIX)) {
+ if (File.separatorChar == '\\') {
+ pattern = StringUtils.replace(pattern, "/", "\\\\");
+ } else {
+ pattern = StringUtils.replace(pattern, "\\\\", "/");
}
- else
- {
- pattern = StringUtils.replace( pattern, "\\\\", "/" );
- }
- }
- else
- {
- pattern = pattern.replace( File.separatorChar == '/' ? '\\' : '/', File.separatorChar );
+ } else {
+ pattern = pattern.replace(File.separatorChar == '/' ? '\\' : '/', File.separatorChar);
- if ( pattern.endsWith( File.separator ) )
- {
+ if (pattern.endsWith(File.separator)) {
pattern += "**";
}
}
@@ -321,19 +316,16 @@ private String normalizePattern( String pattern )
* @return true when the name matches against at least one include pattern, or false
* otherwise.
*/
- protected boolean isIncluded( String name )
- {
- return includesPatterns.matches( name, isCaseSensitive );
+ protected boolean isIncluded(String name) {
+ return includesPatterns.matches(name, isCaseSensitive);
}
- protected boolean isIncluded( String name, String[] tokenizedName )
- {
- return includesPatterns.matches( name, tokenizedName, isCaseSensitive );
+ protected boolean isIncluded(String name, String[] tokenizedName) {
+ return includesPatterns.matches(name, tokenizedName, isCaseSensitive);
}
- protected boolean isIncluded( String name, char[][] tokenizedName )
- {
- return includesPatterns.matches( name, tokenizedName, isCaseSensitive );
+ protected boolean isIncluded(String name, char[][] tokenizedName) {
+ return includesPatterns.matches(name, tokenizedName, isCaseSensitive);
}
/**
@@ -343,9 +335,8 @@ protected boolean isIncluded( String name, char[][] tokenizedName )
* @return true when the name matches against the start of at least one include pattern, or
* false otherwise.
*/
- protected boolean couldHoldIncluded( String name )
- {
- return includesPatterns.matchesPatternStart( name, isCaseSensitive );
+ protected boolean couldHoldIncluded(String name) {
+ return includesPatterns.matchesPatternStart(name, isCaseSensitive);
}
/**
@@ -355,64 +346,53 @@ protected boolean couldHoldIncluded( String name )
* @return true when the name matches against at least one exclude pattern, or false
* otherwise.
*/
- protected boolean isExcluded( String name )
- {
- return excludesPatterns.matches( name, isCaseSensitive );
+ protected boolean isExcluded(String name) {
+ return excludesPatterns.matches(name, isCaseSensitive);
}
- protected boolean isExcluded( String name, String[] tokenizedName )
- {
- return excludesPatterns.matches( name, tokenizedName, isCaseSensitive );
+ protected boolean isExcluded(String name, String[] tokenizedName) {
+ return excludesPatterns.matches(name, tokenizedName, isCaseSensitive);
}
- protected boolean isExcluded( String name, char[][] tokenizedName )
- {
- return excludesPatterns.matches( name, tokenizedName, isCaseSensitive );
+ protected boolean isExcluded(String name, char[][] tokenizedName) {
+ return excludesPatterns.matches(name, tokenizedName, isCaseSensitive);
}
/**
* Adds default exclusions to the current exclusions set.
*/
@Override
- public void addDefaultExcludes()
- {
+ public void addDefaultExcludes() {
int excludesLength = excludes == null ? 0 : excludes.length;
String[] newExcludes;
newExcludes = new String[excludesLength + DEFAULTEXCLUDES.length];
- if ( excludesLength > 0 )
- {
- System.arraycopy( excludes, 0, newExcludes, 0, excludesLength );
+ if (excludesLength > 0) {
+ System.arraycopy(excludes, 0, newExcludes, 0, excludesLength);
}
- for ( int i = 0; i < DEFAULTEXCLUDES.length; i++ )
- {
- newExcludes[i + excludesLength] = DEFAULTEXCLUDES[i].replace( '/', File.separatorChar );
+ for (int i = 0; i < DEFAULTEXCLUDES.length; i++) {
+ newExcludes[i + excludesLength] = DEFAULTEXCLUDES[i].replace('/', File.separatorChar);
}
excludes = newExcludes;
}
- protected void setupDefaultFilters()
- {
- if ( includes == null )
- {
+ protected void setupDefaultFilters() {
+ if (includes == null) {
// No includes supplied, so set it to 'matches all'
includes = new String[1];
includes[0] = "**";
}
- if ( excludes == null )
- {
+ if (excludes == null) {
excludes = new String[0];
}
}
- protected void setupMatchPatterns()
- {
- includesPatterns = MatchPatterns.from( includes );
- excludesPatterns = MatchPatterns.from( excludes );
+ protected void setupMatchPatterns() {
+ includesPatterns = MatchPatterns.from(includes);
+ excludesPatterns = MatchPatterns.from(excludes);
}
@Override
- public void setFilenameComparator( Comparatortrue if the value is defined in the the base 64 alphabet, false otherwise.
*/
- private static boolean isBase64( byte octect )
- {
- if ( octect == PAD )
- {
+ private static boolean isBase64(byte octect) {
+ if (octect == PAD) {
return true;
- }
- else if ( octect < 0 || base64Alphabet[octect] == -1 )
- {
+ } else if (octect < 0 || base64Alphabet[octect] == -1) {
return false;
- }
- else
- {
+ } else {
return true;
}
}
@@ -191,22 +176,18 @@ else if ( octect < 0 || base64Alphabet[octect] == -1 )
* @return true if all bytes are valid characters in the Base64 alphabet or if the byte array is empty;
* false, otherwise
*/
- public static boolean isArrayByteBase64( byte[] arrayOctect )
- {
+ public static boolean isArrayByteBase64(byte[] arrayOctect) {
- arrayOctect = discardWhitespace( arrayOctect );
+ arrayOctect = discardWhitespace(arrayOctect);
int length = arrayOctect.length;
- if ( length == 0 )
- {
+ if (length == 0) {
// shouldn't a 0 length array be valid base64 data?
// return false;
return true;
}
- for ( byte anArrayOctect : arrayOctect )
- {
- if ( !isBase64( anArrayOctect ) )
- {
+ for (byte anArrayOctect : arrayOctect) {
+ if (!isBase64(anArrayOctect)) {
return false;
}
}
@@ -219,9 +200,8 @@ public static boolean isArrayByteBase64( byte[] arrayOctect )
* @param binaryData binary data to encode
* @return Base64 characters
*/
- public static byte[] encodeBase64( byte[] binaryData )
- {
- return encodeBase64( binaryData, false );
+ public static byte[] encodeBase64(byte[] binaryData) {
+ return encodeBase64(binaryData, false);
}
/**
@@ -230,9 +210,8 @@ public static byte[] encodeBase64( byte[] binaryData )
* @param binaryData binary data to encode
* @return Base64 characters chunked in 76 character blocks
*/
- public static byte[] encodeBase64Chunked( byte[] binaryData )
- {
- return encodeBase64( binaryData, true );
+ public static byte[] encodeBase64Chunked(byte[] binaryData) {
+ return encodeBase64(binaryData, true);
}
/**
@@ -241,9 +220,8 @@ public static byte[] encodeBase64Chunked( byte[] binaryData )
* @param pArray A byte array containing Base64 character data
* @return a byte array containing binary data
*/
- public byte[] decode( byte[] pArray )
- {
- return decodeBase64( pArray );
+ public byte[] decode(byte[] pArray) {
+ return decodeBase64(pArray);
}
/**
@@ -253,8 +231,7 @@ public byte[] decode( byte[] pArray )
* @param isChunked if true this encoder will chunk the base64 output into 76 character blocks
* @return Base64-encoded data.
*/
- public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
- {
+ public static byte[] encodeBase64(byte[] binaryData, boolean isChunked) {
int lengthDataBits = binaryData.length * EIGHTBIT;
int fewerThan24bits = lengthDataBits % TWENTYFOURBITGROUP;
int numberTriplets = lengthDataBits / TWENTYFOURBITGROUP;
@@ -262,13 +239,10 @@ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
int encodedDataLength = 0;
int nbrChunks = 0;
- if ( fewerThan24bits != 0 )
- {
+ if (fewerThan24bits != 0) {
// data not divisible by 24 bit
- encodedDataLength = ( numberTriplets + 1 ) * 4;
- }
- else
- {
+ encodedDataLength = (numberTriplets + 1) * 4;
+ } else {
// 16 or 8 bit
encodedDataLength = numberTriplets * 4;
}
@@ -276,10 +250,9 @@ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
// If the output is to be "chunked" into 76 character sections,
// for compliance with RFC 2045 MIME, then it is important to
// allow for extra length to account for the separator(s)
- if ( isChunked )
- {
+ if (isChunked) {
- nbrChunks = ( CHUNK_SEPARATOR.length == 0 ? 0 : (int) Math.ceil( (float) encodedDataLength / CHUNK_SIZE ) );
+ nbrChunks = (CHUNK_SEPARATOR.length == 0 ? 0 : (int) Math.ceil((float) encodedDataLength / CHUNK_SIZE));
encodedDataLength += nbrChunks * CHUNK_SEPARATOR.length;
}
@@ -294,8 +267,7 @@ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
int chunksSoFar = 0;
// log.debug("number of triplets = " + numberTriplets);
- for ( i = 0; i < numberTriplets; i++ )
- {
+ for (i = 0; i < numberTriplets; i++) {
dataIndex = i * 3;
b1 = binaryData[dataIndex];
b2 = binaryData[dataIndex + 1];
@@ -303,33 +275,30 @@ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
// log.debug("b1= " + b1 +", b2= " + b2 + ", b3= " + b3);
- l = (byte) ( b2 & 0x0f );
- k = (byte) ( b1 & 0x03 );
+ l = (byte) (b2 & 0x0f);
+ k = (byte) (b1 & 0x03);
- byte val1 = ( ( b1 & SIGN ) == 0 ) ? (byte) ( b1 >> 2 ) : (byte) ( ( b1 ) >> 2 ^ 0xc0 );
- byte val2 = ( ( b2 & SIGN ) == 0 ) ? (byte) ( b2 >> 4 ) : (byte) ( ( b2 ) >> 4 ^ 0xf0 );
- byte val3 = ( ( b3 & SIGN ) == 0 ) ? (byte) ( b3 >> 6 ) : (byte) ( ( b3 ) >> 6 ^ 0xfc );
+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+ byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
+ byte val3 = ((b3 & SIGN) == 0) ? (byte) (b3 >> 6) : (byte) ((b3) >> 6 ^ 0xfc);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
// log.debug( "val2 = " + val2 );
// log.debug( "k4 = " + (k<<4) );
// log.debug( "vak = " + (val2 | (k<<4)) );
- encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | ( k << 4 )];
- encodedData[encodedIndex + 2] = lookUpBase64Alphabet[( l << 2 ) | val3];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | (k << 4)];
+ encodedData[encodedIndex + 2] = lookUpBase64Alphabet[(l << 2) | val3];
encodedData[encodedIndex + 3] = lookUpBase64Alphabet[b3 & 0x3f];
encodedIndex += 4;
// If we are chunking, let's put a chunk separator down.
- if ( isChunked )
- {
+ if (isChunked) {
// this assumes that CHUNK_SIZE % 4 == 0
- if ( encodedIndex == nextSeparatorIndex )
- {
- System.arraycopy( CHUNK_SEPARATOR, 0, encodedData, encodedIndex, CHUNK_SEPARATOR.length );
+ if (encodedIndex == nextSeparatorIndex) {
+ System.arraycopy(CHUNK_SEPARATOR, 0, encodedData, encodedIndex, CHUNK_SEPARATOR.length);
chunksSoFar++;
- nextSeparatorIndex =
- ( CHUNK_SIZE * ( chunksSoFar + 1 ) ) + ( chunksSoFar * CHUNK_SEPARATOR.length );
+ nextSeparatorIndex = (CHUNK_SIZE * (chunksSoFar + 1)) + (chunksSoFar * CHUNK_SEPARATOR.length);
encodedIndex += CHUNK_SEPARATOR.length;
}
}
@@ -338,42 +307,41 @@ public static byte[] encodeBase64( byte[] binaryData, boolean isChunked )
// form integral number of 6-bit groups
dataIndex = i * 3;
- if ( fewerThan24bits == EIGHTBIT )
- {
+ if (fewerThan24bits == EIGHTBIT) {
b1 = binaryData[dataIndex];
- k = (byte) ( b1 & 0x03 );
+ k = (byte) (b1 & 0x03);
// log.debug("b1=" + b1);
// log.debug("b1<<2 = " + (b1>>2) );
- byte val1 = ( ( b1 & SIGN ) == 0 ) ? (byte) ( b1 >> 2 ) : (byte) ( ( b1 ) >> 2 ^ 0xc0 );
+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
encodedData[encodedIndex + 1] = lookUpBase64Alphabet[k << 4];
encodedData[encodedIndex + 2] = PAD;
encodedData[encodedIndex + 3] = PAD;
- }
- else if ( fewerThan24bits == SIXTEENBIT )
- {
+ } else if (fewerThan24bits == SIXTEENBIT) {
b1 = binaryData[dataIndex];
b2 = binaryData[dataIndex + 1];
- l = (byte) ( b2 & 0x0f );
- k = (byte) ( b1 & 0x03 );
+ l = (byte) (b2 & 0x0f);
+ k = (byte) (b1 & 0x03);
- byte val1 = ( ( b1 & SIGN ) == 0 ) ? (byte) ( b1 >> 2 ) : (byte) ( ( b1 ) >> 2 ^ 0xc0 );
- byte val2 = ( ( b2 & SIGN ) == 0 ) ? (byte) ( b2 >> 4 ) : (byte) ( ( b2 ) >> 4 ^ 0xf0 );
+ byte val1 = ((b1 & SIGN) == 0) ? (byte) (b1 >> 2) : (byte) ((b1) >> 2 ^ 0xc0);
+ byte val2 = ((b2 & SIGN) == 0) ? (byte) (b2 >> 4) : (byte) ((b2) >> 4 ^ 0xf0);
encodedData[encodedIndex] = lookUpBase64Alphabet[val1];
- encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | ( k << 4 )];
+ encodedData[encodedIndex + 1] = lookUpBase64Alphabet[val2 | (k << 4)];
encodedData[encodedIndex + 2] = lookUpBase64Alphabet[l << 2];
encodedData[encodedIndex + 3] = PAD;
}
- if ( isChunked )
- {
+ if (isChunked) {
// we also add a separator to the end of the final chunk.
- if ( chunksSoFar < nbrChunks )
- {
- System.arraycopy( CHUNK_SEPARATOR, 0, encodedData, encodedDataLength - CHUNK_SEPARATOR.length,
- CHUNK_SEPARATOR.length );
+ if (chunksSoFar < nbrChunks) {
+ System.arraycopy(
+ CHUNK_SEPARATOR,
+ 0,
+ encodedData,
+ encodedDataLength - CHUNK_SEPARATOR.length,
+ CHUNK_SEPARATOR.length);
}
}
@@ -386,14 +354,12 @@ else if ( fewerThan24bits == SIXTEENBIT )
* @param base64Data Byte array containing Base64 data
* @return Array containing decoded data.
*/
- public static byte[] decodeBase64( byte[] base64Data )
- {
+ public static byte[] decodeBase64(byte[] base64Data) {
// RFC 2045 requires that we discard ALL non-Base64 characters
- base64Data = discardNonBase64( base64Data );
+ base64Data = discardNonBase64(base64Data);
// handle the edge case, so we don't have to worry about it later
- if ( base64Data.length == 0 )
- {
+ if (base64Data.length == 0) {
return new byte[0];
}
@@ -409,18 +375,15 @@ public static byte[] decodeBase64( byte[] base64Data )
// this sizes the output array properly - rlw
int lastData = base64Data.length;
// ignore the '=' padding
- while ( base64Data[lastData - 1] == PAD )
- {
- if ( --lastData == 0 )
- {
+ while (base64Data[lastData - 1] == PAD) {
+ if (--lastData == 0) {
return new byte[0];
}
}
decodedData = new byte[lastData - numberQuadruple];
}
- for ( int i = 0; i < numberQuadruple; i++ )
- {
+ for (int i = 0; i < numberQuadruple; i++) {
dataIndex = i * 4;
marker0 = base64Data[dataIndex + 2];
marker1 = base64Data[dataIndex + 3];
@@ -428,28 +391,23 @@ public static byte[] decodeBase64( byte[] base64Data )
b1 = base64Alphabet[base64Data[dataIndex]];
b2 = base64Alphabet[base64Data[dataIndex + 1]];
- if ( marker0 != PAD && marker1 != PAD )
- {
+ if (marker0 != PAD && marker1 != PAD) {
// No PAD e.g 3cQl
b3 = base64Alphabet[marker0];
b4 = base64Alphabet[marker1];
- decodedData[encodedIndex] = (byte) ( b1 << 2 | b2 >> 4 );
- decodedData[encodedIndex + 1] = (byte) ( ( ( b2 & 0xf ) << 4 ) | ( ( b3 >> 2 ) & 0xf ) );
- decodedData[encodedIndex + 2] = (byte) ( b3 << 6 | b4 );
- }
- else if ( marker0 == PAD )
- {
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
+ decodedData[encodedIndex + 2] = (byte) (b3 << 6 | b4);
+ } else if (marker0 == PAD) {
// Two PAD e.g. 3c[Pad][Pad]
- decodedData[encodedIndex] = (byte) ( b1 << 2 | b2 >> 4 );
- }
- else if ( marker1 == PAD )
- {
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ } else if (marker1 == PAD) {
// One PAD e.g. 3cQ[Pad]
b3 = base64Alphabet[marker0];
- decodedData[encodedIndex] = (byte) ( b1 << 2 | b2 >> 4 );
- decodedData[encodedIndex + 1] = (byte) ( ( ( b2 & 0xf ) << 4 ) | ( ( b3 >> 2 ) & 0xf ) );
+ decodedData[encodedIndex] = (byte) (b1 << 2 | b2 >> 4);
+ decodedData[encodedIndex + 1] = (byte) (((b2 & 0xf) << 4) | ((b3 >> 2) & 0xf));
}
encodedIndex += 3;
}
@@ -462,15 +420,12 @@ else if ( marker1 == PAD )
* @param data The base-64 encoded data to discard the whitespace from.
* @return The data, less whitespace (see RFC 2045).
*/
- static byte[] discardWhitespace( byte[] data )
- {
+ static byte[] discardWhitespace(byte[] data) {
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
- for ( byte aData : data )
- {
- switch ( aData )
- {
+ for (byte aData : data) {
+ switch (aData) {
case (byte) ' ':
case (byte) '\n':
case (byte) '\r':
@@ -483,7 +438,7 @@ static byte[] discardWhitespace( byte[] data )
byte packedData[] = new byte[bytesCopied];
- System.arraycopy( groomedData, 0, packedData, 0, bytesCopied );
+ System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
return packedData;
}
@@ -495,22 +450,19 @@ static byte[] discardWhitespace( byte[] data )
* @param data The base-64 encoded data to groom
* @return The data, less non-base64 characters (see RFC 2045).
*/
- static byte[] discardNonBase64( byte[] data )
- {
+ static byte[] discardNonBase64(byte[] data) {
byte groomedData[] = new byte[data.length];
int bytesCopied = 0;
- for ( byte aData : data )
- {
- if ( isBase64( aData ) )
- {
+ for (byte aData : data) {
+ if (isBase64(aData)) {
groomedData[bytesCopied++] = aData;
}
}
byte packedData[] = new byte[bytesCopied];
- System.arraycopy( groomedData, 0, packedData, 0, bytesCopied );
+ System.arraycopy(groomedData, 0, packedData, 0, bytesCopied);
return packedData;
}
@@ -521,9 +473,7 @@ static byte[] discardNonBase64( byte[] data )
* @param pArray a byte array containing binary data
* @return A byte array containing only Base64 character data
*/
- public byte[] encode( byte[] pArray )
- {
- return encodeBase64( pArray, false );
+ public byte[] encode(byte[] pArray) {
+ return encodeBase64(pArray, false);
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java b/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java
new file mode 100644
index 00000000..beb5e16d
--- /dev/null
+++ b/src/main/java/org/codehaus/plexus/util/BaseFileUtils.java
@@ -0,0 +1,21 @@
+package org.codehaus.plexus.util;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.OpenOption;
+import java.nio.file.Path;
+
+/**
+ * Implementation specific to Java SE 8 version.
+ */
+abstract class BaseFileUtils {
+ static String fileRead(Path path, String encoding) throws IOException {
+ byte[] bytes = Files.readAllBytes(path);
+ return encoding != null ? new String(bytes, encoding) : new String(bytes);
+ }
+
+ static void fileWrite(Path path, String encoding, String data, OpenOption... openOptions) throws IOException {
+ byte[] bytes = encoding != null ? data.getBytes(encoding) : data.getBytes();
+ Files.write(path, bytes, openOptions);
+ }
+}
diff --git a/src/main/java/org/codehaus/plexus/util/BaseIOUtil.java b/src/main/java/org/codehaus/plexus/util/BaseIOUtil.java
index ac2ade02..ab391c87 100644
--- a/src/main/java/org/codehaus/plexus/util/BaseIOUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/BaseIOUtil.java
@@ -9,19 +9,14 @@
/**
* Implementation specific to Java SE 8 version.
*/
-abstract class BaseIOUtil
-{
+abstract class BaseIOUtil {
private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;
- static void copy( final InputStream input, final OutputStream output )
- throws IOException
- {
- IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
+ static void copy(final InputStream input, final OutputStream output) throws IOException {
+ IOUtil.copy(input, output, DEFAULT_BUFFER_SIZE);
}
- static void copy( final Reader input, final Writer output )
- throws IOException
- {
- IOUtil.copy( input, output, DEFAULT_BUFFER_SIZE );
+ static void copy(final Reader input, final Writer output) throws IOException {
+ IOUtil.copy(input, output, DEFAULT_BUFFER_SIZE);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/CachedMap.java b/src/main/java/org/codehaus/plexus/util/CachedMap.java
index c77d2180..6c78dce0 100644
--- a/src/main/java/org/codehaus/plexus/util/CachedMap.java
+++ b/src/main/java/org/codehaus/plexus/util/CachedMap.java
@@ -38,13 +38,11 @@
* * This class is public domain (not copyrighted). *
- * + * * @author Jean-Marie Dautelle * @version 5.3, October 30, 2003 */ -public final class CachedMap - implements Map -{ +public final class CachedMap implements Map { /** * Holds the FastMap backing this collection (null if generic backing map).
@@ -80,9 +78,8 @@ public final class CachedMap
* Creates a cached map backed by a {@link FastMap}. The default cache size and map capacity is set to
* 256 entries.
*/
- public CachedMap()
- {
- this( 256, new FastMap() );
+ public CachedMap() {
+ this(256, new FastMap());
}
/**
@@ -91,9 +88,8 @@ public CachedMap()
* @param cacheSize the cache size, the actual cache size is the first power of 2 greater or equal to
* cacheSize. This is also the initial capacity of the backing map.
*/
- public CachedMap( int cacheSize )
- {
- this( cacheSize, new FastMap( cacheSize ) );
+ public CachedMap(int cacheSize) {
+ this(cacheSize, new FastMap(cacheSize));
}
/**
@@ -105,13 +101,11 @@ public CachedMap( int cacheSize )
* cacheSize.
* @param backingMap the backing map to be "wrapped" in a cached map.
*/
- public CachedMap( int cacheSize, Map backingMap )
- {
+ public CachedMap(int cacheSize, Map backingMap) {
// Find a power of 2 >= minimalCache
int actualCacheSize = 1;
- while ( actualCacheSize < cacheSize )
- {
+ while (actualCacheSize < cacheSize) {
actualCacheSize <<= 1;
}
@@ -121,20 +115,16 @@ public CachedMap( int cacheSize, Map backingMap )
_mask = actualCacheSize - 1;
// Sets backing map references.
- if ( backingMap instanceof FastMap )
- {
+ if (backingMap instanceof FastMap) {
_backingFastMap = (FastMap) backingMap;
_backingMap = _backingFastMap;
_keysMap = null;
- }
- else
- {
+ } else {
_backingFastMap = null;
_backingMap = backingMap;
- _keysMap = new FastMap( backingMap.size() );
- for ( Object key : backingMap.keySet() )
- {
- _keysMap.put( key, key );
+ _keysMap = new FastMap(backingMap.size());
+ for (Object key : backingMap.keySet()) {
+ _keysMap.put(key, key);
}
}
}
@@ -144,8 +134,7 @@ public CachedMap( int cacheSize, Map backingMap )
*
* @return the cache size (power of 2).
*/
- public int getCacheSize()
- {
+ public int getCacheSize() {
return _keys.length;
}
@@ -155,28 +144,23 @@ public int getCacheSize()
* @return the backing map.
* @see #flush
*/
- public Map getBackingMap()
- {
- return ( _backingFastMap != null ) ? _backingFastMap : _backingMap;
+ public Map getBackingMap() {
+ return (_backingFastMap != null) ? _backingFastMap : _backingMap;
}
/**
* Flushes the key/value pairs being cached. This method should be called if the backing map is externally modified.
*/
- public void flush()
- {
- for ( int i = 0; i < _keys.length; i++ )
- {
+ public void flush() {
+ for (int i = 0; i < _keys.length; i++) {
_keys[i] = null;
_values[i] = null;
}
- if ( _keysMap != null )
- {
+ if (_keysMap != null) {
// Re-populates keys from backing map.
- for ( Object key : _backingMap.keySet() )
- {
- _keysMap.put( key, key );
+ for (Object key : _backingMap.keySet()) {
+ _keysMap.put(key, key);
}
}
}
@@ -192,41 +176,30 @@ public void flush()
* @throws NullPointerException if the key is null.
*/
@Override
- public Object get( Object key )
- {
+ public Object get(Object key) {
int index = key.hashCode() & _mask;
- return key.equals( _keys[index] ) ? _values[index] : getCacheMissed( key, index );
+ return key.equals(_keys[index]) ? _values[index] : getCacheMissed(key, index);
}
- private Object getCacheMissed( Object key, int index )
- {
- if ( _backingFastMap != null )
- {
- Map.Entry entry = _backingFastMap.getEntry( key );
- if ( entry != null )
- {
+ private Object getCacheMissed(Object key, int index) {
+ if (_backingFastMap != null) {
+ Map.Entry entry = _backingFastMap.getEntry(key);
+ if (entry != null) {
_keys[index] = entry.getKey();
Object value = entry.getValue();
_values[index] = value;
return value;
- }
- else
- {
+ } else {
return null;
}
- }
- else
- { // Generic backing map.
- Object mapKey = _keysMap.get( key );
- if ( mapKey != null )
- {
+ } else { // Generic backing map.
+ Object mapKey = _keysMap.get(key);
+ if (mapKey != null) {
_keys[index] = mapKey;
- Object value = _backingMap.get( key );
+ Object value = _backingMap.get(key);
_values[index] = value;
return value;
- }
- else
- {
+ } else {
return null;
}
}
@@ -245,21 +218,17 @@ private Object getCacheMissed( Object key, int index )
* @throws NullPointerException if the key is null.
*/
@Override
- public Object put( Object key, Object value )
- {
+ public Object put(Object key, Object value) {
// Updates the cache.
int index = key.hashCode() & _mask;
- if ( key.equals( _keys[index] ) )
- {
+ if (key.equals(_keys[index])) {
_values[index] = value;
- }
- else if ( _keysMap != null )
- { // Possibly a new key.
- _keysMap.put( key, key );
+ } else if (_keysMap != null) { // Possibly a new key.
+ _keysMap.put(key, key);
}
// Updates the backing map.
- return _backingMap.put( key, value );
+ return _backingMap.put(key, value);
}
/**
@@ -272,21 +241,18 @@ else if ( _keysMap != null )
* @throws UnsupportedOperationException if the remove method is not supported by the backing map.
*/
@Override
- public Object remove( Object key )
- {
+ public Object remove(Object key) {
// Removes from cache.
int index = key.hashCode() & _mask;
- if ( key.equals( _keys[index] ) )
- {
+ if (key.equals(_keys[index])) {
_keys[index] = null;
}
// Removes from key map.
- if ( _keysMap != null )
- {
- _keysMap.remove( key );
+ if (_keysMap != null) {
+ _keysMap.remove(key);
}
// Removes from backing map.
- return _backingMap.remove( key );
+ return _backingMap.remove(key);
}
/**
@@ -296,17 +262,13 @@ public Object remove( Object key )
* @return true if this map contains a mapping for the specified key; false otherwise.
*/
@Override
- public boolean containsKey( Object key )
- {
+ public boolean containsKey(Object key) {
// Checks the cache.
int index = key.hashCode() & _mask;
- if ( key.equals( _keys[index] ) )
- {
+ if (key.equals(_keys[index])) {
return true;
- }
- else
- { // Checks the backing map.
- return _backingMap.containsKey( key );
+ } else { // Checks the backing map.
+ return _backingMap.containsKey(key);
}
}
@@ -317,8 +279,7 @@ public boolean containsKey( Object key )
* @return the number of key-value mappings in this map.
*/
@Override
- public int size()
- {
+ public int size() {
return _backingMap.size();
}
@@ -328,8 +289,7 @@ public int size()
* @return true if this map contains no key-value mappings.
*/
@Override
- public boolean isEmpty()
- {
+ public boolean isEmpty() {
return _backingMap.isEmpty();
}
@@ -343,9 +303,8 @@ public boolean isEmpty()
* null values.
*/
@Override
- public boolean containsValue( Object value )
- {
- return _backingMap.containsValue( value );
+ public boolean containsValue(Object value) {
+ return _backingMap.containsValue(value);
}
/**
@@ -362,9 +321,8 @@ public boolean containsValue( Object value )
* null keys or values, and the specified map contains null keys or values.
*/
@Override
- public void putAll( Map map )
- {
- _backingMap.putAll( map );
+ public void putAll(Map map) {
+ _backingMap.putAll(map);
flush();
}
@@ -374,8 +332,7 @@ public void putAll( Map map )
* @throws UnsupportedOperationException if clear is not supported by the backing map.
*/
@Override
- public void clear()
- {
+ public void clear() {
_backingMap.clear();
flush();
}
@@ -386,9 +343,8 @@ public void clear()
* @return an unmodifiable view of the keys contained in this map.
*/
@Override
- public Set keySet()
- {
- return Collections.unmodifiableSet( _backingMap.keySet() );
+ public Set keySet() {
+ return Collections.unmodifiableSet(_backingMap.keySet());
}
/**
@@ -397,9 +353,8 @@ public Set keySet()
* @return an unmodifiable view of the values contained in this map.
*/
@Override
- public Collection values()
- {
- return Collections.unmodifiableCollection( _backingMap.values() );
+ public Collection values() {
+ return Collections.unmodifiableCollection(_backingMap.values());
}
/**
@@ -409,9 +364,8 @@ public Collection values()
* @return an unmodifiable view of the mappings contained in this map.
*/
@Override
- public Set entrySet()
- {
- return Collections.unmodifiableSet( _backingMap.entrySet() );
+ public Set entrySet() {
+ return Collections.unmodifiableSet(_backingMap.entrySet());
}
/**
@@ -422,9 +376,8 @@ public Set entrySet()
* @return true if the specified object is equal to this map.
*/
@Override
- public boolean equals( Object o )
- {
- return _backingMap.equals( o );
+ public boolean equals(Object o) {
+ return _backingMap.equals(o);
}
/**
@@ -433,8 +386,7 @@ public boolean equals( Object o )
* @return the hash code value for this map.
*/
@Override
- public int hashCode()
- {
+ public int hashCode() {
return _backingMap.hashCode();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
index b16200fd..c966d8ff 100644
--- a/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/CollectionUtils.java
@@ -30,8 +30,7 @@
* @author olamy
*
*/
-public class CollectionUtils
-{
+public class CollectionUtils {
// ----------------------------------------------------------------------
// Static methods that can probably be moved to a real util class.
// ----------------------------------------------------------------------
@@ -48,21 +47,17 @@ public class CollectionUtils
* @param null indicates that the element does not appear in the given {@link Collection}.
- *
+ *
* @param col The collection to count cardinalities for
* @param Class for scanning a directory for files/directories which match certain criteria.
- * + * *These criteria consist of selectors and patterns which have been specified. With the selectors you can select which * files you want to have included. Files which are not selected are excluded. With patterns you can include or exclude * files based on their filename.
- * + * *The idea is simple. A given directory is recursively scanned for all files and directories. Each file/directory is * matched against a set of selectors, including special support for matching against filenames with include and and * exclude patterns. Only files/directories which match at least one pattern of the include pattern list or other file * selector, and don't match any pattern of the exclude pattern list or fail to match against a required selector will * be placed in the list of files/directories found.
- * + * *When no list of include patterns is supplied, "**" will be used, which means that everything will be matched. When no * list of exclude patterns is supplied, an empty list is used, such that nothing will be excluded. When no selectors * are supplied, none are applied.
- * + * *The filename pattern matching is done as follows: The name to be matched is split up in path segments. A path segment
* is the name of a directory or file, which is bounded by File.separator ('/' under UNIX, '\' under
* Windows). For example, "abc/def/ghi/xyz.java" is split up in the segments "abc", "def","ghi" and "xyz.java". The same
* is done for the pattern against which should be matched.
The segments of the name and the pattern are then matched against each other. When '**' is used for a path segment in * the pattern, it matches zero or more path segments of the name.
- * + * *There is a special case regarding the use of File.separators at the beginning of the pattern and the
* string to match:
* When a pattern starts with a File.separator, the string to match must also start with a
* File.separator. When a pattern does not start with a File.separator, the string to match
* may not start with a File.separator. When one of these rules is not obeyed, the string will not match.
When a name path segment is matched against a pattern path segment, the following special characters can be used:
* '*' matches zero or more characters
* '?' matches one character.
Case sensitivity may be turned off if necessary. By default, it is turned on.
* Example of usage: *@@ -122,7 +122,7 @@ * System.out.println( files[i] ); * } *- * + * *
This will scan a directory called test for .class files, but excludes all files in all proper subdirectories of a * directory called "modules"
* @@ -131,9 +131,7 @@ * @author Bruce Atherton * @author Antoine Levy-Lambert */ -public class DirectoryScanner - extends AbstractScanner -{ +public class DirectoryScanner extends AbstractScanner { private static final String[] EMPTY_STRING_ARRAY = new String[0]; @@ -199,14 +197,12 @@ public class DirectoryScanner */ protected boolean everythingIncluded = true; - private final char[][] tokenizedEmpty = MatchPattern.tokenizePathToCharArray( "", File.separator ); + private final char[][] tokenizedEmpty = MatchPattern.tokenizePathToCharArray("", File.separator); /** * Sole constructor. */ - public DirectoryScanner() - { - } + public DirectoryScanner() {} /** * Sets the base directory to be scanned. This is the directory which is scanned recursively. All '/' and '\' @@ -215,9 +211,8 @@ public DirectoryScanner() * * @param basedir The base directory to scan. Must not benull.
*/
- public void setBasedir( String basedir )
- {
- setBasedir( new File( basedir.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar ) ) );
+ public void setBasedir(String basedir) {
+ setBasedir(new File(basedir.replace('/', File.separatorChar).replace('\\', File.separatorChar)));
}
/**
@@ -225,8 +220,7 @@ public void setBasedir( String basedir )
*
* @param basedir The base directory for scanning. Should not be null.
*/
- public void setBasedir( File basedir )
- {
+ public void setBasedir(File basedir) {
this.basedir = basedir;
}
@@ -236,8 +230,7 @@ public void setBasedir( File basedir )
* @return the base directory to be scanned
*/
@Override
- public File getBasedir()
- {
+ public File getBasedir() {
return basedir;
}
@@ -246,8 +239,7 @@ public File getBasedir()
*
* @param followSymlinks whether or not symbolic links should be followed
*/
- public void setFollowSymlinks( boolean followSymlinks )
- {
+ public void setFollowSymlinks(boolean followSymlinks) {
this.followSymlinks = followSymlinks;
}
@@ -256,8 +248,7 @@ public void setFollowSymlinks( boolean followSymlinks )
*
* @return true if all files and directories which have been found so far have been included.
*/
- public boolean isEverythingIncluded()
- {
+ public boolean isEverythingIncluded() {
return everythingIncluded;
}
@@ -269,20 +260,15 @@ public boolean isEverythingIncluded()
* exist, or isn't a directory).
*/
@Override
- public void scan()
- throws IllegalStateException
- {
- if ( basedir == null )
- {
- throw new IllegalStateException( "No basedir set" );
+ public void scan() throws IllegalStateException {
+ if (basedir == null) {
+ throw new IllegalStateException("No basedir set");
}
- if ( !basedir.exists() )
- {
- throw new IllegalStateException( "basedir " + basedir + " does not exist" );
+ if (!basedir.exists()) {
+ throw new IllegalStateException("basedir " + basedir + " does not exist");
}
- if ( !basedir.isDirectory() )
- {
- throw new IllegalStateException( "basedir " + basedir + " is not a directory" );
+ if (!basedir.isDirectory()) {
+ throw new IllegalStateException("basedir " + basedir + " is not a directory");
}
setupDefaultFilters();
@@ -297,62 +283,47 @@ public void scan()
dirsExcluded = new ArrayListTop level invocation for a slow scan. A slow scan builds up a full list of excluded/included files/directories, * whereas a fast scan will only have full results for included files, as it ignores directories which can't * possibly hold any included files/directories.
- * + * *Returns immediately if a slow scan has already been completed.
*/ - protected void slowScan() - { - if ( haveSlowResults ) - { + protected void slowScan() { + if (haveSlowResults) { return; } - String[] excl = dirsExcluded.toArray( EMPTY_STRING_ARRAY ); - String[] notIncl = dirsNotIncluded.toArray( EMPTY_STRING_ARRAY ); + String[] excl = dirsExcluded.toArray(EMPTY_STRING_ARRAY); + String[] notIncl = dirsNotIncluded.toArray(EMPTY_STRING_ARRAY); - for ( String anExcl : excl ) - { - if ( !couldHoldIncluded( anExcl ) ) - { - scandir( new File( basedir, anExcl ), anExcl + File.separator, false ); + for (String anExcl : excl) { + if (!couldHoldIncluded(anExcl)) { + scandir(new File(basedir, anExcl), anExcl + File.separator, false); } } - for ( String aNotIncl : notIncl ) - { - if ( !couldHoldIncluded( aNotIncl ) ) - { - scandir( new File( basedir, aNotIncl ), aNotIncl + File.separator, false ); + for (String aNotIncl : notIncl) { + if (!couldHoldIncluded(aNotIncl)) { + scandir(new File(basedir, aNotIncl), aNotIncl + File.separator, false); } } @@ -376,12 +347,10 @@ protected void slowScan() * @see #dirsExcluded * @see #slowScan */ - protected void scandir( File dir, String vpath, boolean fast ) - { + protected void scandir(File dir, String vpath, boolean fast) { String[] newfiles = dir.list(); - if ( newfiles == null ) - { + if (newfiles == null) { /* * two reasons are mentioned in the API docs for File.list (1) dir is not a directory. This is impossible as * we wouldn't get here in this case. (2) an IO error occurred (why doesn't it throw an exception then???) @@ -401,122 +370,85 @@ protected void scandir( File dir, String vpath, boolean fast ) // throw new IOException( "IO error scanning directory " + dir.getAbsolutePath() ); } - if ( !followSymlinks ) - { - try - { - if ( isParentSymbolicLink( dir, null ) ) - { - for ( String newfile : newfiles ) - { + if (!followSymlinks) { + try { + if (isParentSymbolicLink(dir, null)) { + for (String newfile : newfiles) { String name = vpath + newfile; - File file = new File( dir, newfile ); - if ( file.isDirectory() ) - { - dirsExcluded.add( name ); - } - else - { - filesExcluded.add( name ); + File file = new File(dir, newfile); + if (file.isDirectory()) { + dirsExcluded.add(name); + } else { + filesExcluded.add(name); } } return; } - } - catch ( IOException ioe ) - { + } catch (IOException ioe) { String msg = "IOException caught while checking for links!"; // will be caught and redirected to Ant's logging system - System.err.println( msg ); + System.err.println(msg); } } - if ( filenameComparator != null ) - { - Arrays.sort( newfiles, filenameComparator ); + if (filenameComparator != null) { + Arrays.sort(newfiles, filenameComparator); } - for ( String newfile : newfiles ) - { + for (String newfile : newfiles) { String name = vpath + newfile; - char[][] tokenizedName = MatchPattern.tokenizePathToCharArray( name, File.separator ); - File file = new File( dir, newfile ); - if ( file.isDirectory() ) - { - - if ( isIncluded( name, tokenizedName ) ) - { - if ( !isExcluded( name, tokenizedName ) ) - { - if ( isSelected( name, file ) ) - { - dirsIncluded.add( name ); - if ( fast ) - { - scandir( file, name + File.separator, fast ); + char[][] tokenizedName = MatchPattern.tokenizePathToCharArray(name, File.separator); + File file = new File(dir, newfile); + if (file.isDirectory()) { + + if (isIncluded(name, tokenizedName)) { + if (!isExcluded(name, tokenizedName)) { + if (isSelected(name, file)) { + dirsIncluded.add(name); + if (fast) { + scandir(file, name + File.separator, fast); } - } - else - { + } else { everythingIncluded = false; - dirsDeselected.add( name ); - if ( fast && couldHoldIncluded( name ) ) - { - scandir( file, name + File.separator, fast ); + dirsDeselected.add(name); + if (fast && couldHoldIncluded(name)) { + scandir(file, name + File.separator, fast); } } - } - else - { + } else { everythingIncluded = false; - dirsExcluded.add( name ); - if ( fast && couldHoldIncluded( name ) ) - { - scandir( file, name + File.separator, fast ); + dirsExcluded.add(name); + if (fast && couldHoldIncluded(name)) { + scandir(file, name + File.separator, fast); } } - } - else - { + } else { everythingIncluded = false; - dirsNotIncluded.add( name ); - if ( fast && couldHoldIncluded( name ) ) - { - scandir( file, name + File.separator, fast ); + dirsNotIncluded.add(name); + if (fast && couldHoldIncluded(name)) { + scandir(file, name + File.separator, fast); } } - if ( !fast ) - { - scandir( file, name + File.separator, fast ); + if (!fast) { + scandir(file, name + File.separator, fast); } - } - else if ( file.isFile() ) - { - if ( isIncluded( name, tokenizedName ) ) - { - if ( !isExcluded( name, tokenizedName ) ) - { - if ( isSelected( name, file ) ) - { - filesIncluded.add( name ); - } - else - { + } else if (file.isFile()) { + if (isIncluded(name, tokenizedName)) { + if (!isExcluded(name, tokenizedName)) { + if (isSelected(name, file)) { + filesIncluded.add(name); + } else { everythingIncluded = false; - filesDeselected.add( name ); + filesDeselected.add(name); } - } - else - { + } else { everythingIncluded = false; - filesExcluded.add( name ); + filesExcluded.add(name); } - } - else - { + } else { everythingIncluded = false; - filesNotIncluded.add( name ); + filesNotIncluded.add(name); } } } @@ -530,8 +462,7 @@ else if ( file.isFile() ) * @returnfalse when the selectors says that the file should not be selected, true
* otherwise.
*/
- protected boolean isSelected( String name, File file )
- {
+ protected boolean isSelected(String name, File file) {
return true;
}
@@ -543,9 +474,8 @@ protected boolean isSelected( String name, File file )
* patterns.
*/
@Override
- public String[] getIncludedFiles()
- {
- return filesIncluded.toArray( EMPTY_STRING_ARRAY );
+ public String[] getIncludedFiles() {
+ return filesIncluded.toArray(EMPTY_STRING_ARRAY);
}
/**
@@ -555,10 +485,9 @@ public String[] getIncludedFiles()
* @return the names of the files which matched none of the include patterns.
* @see #slowScan
*/
- public String[] getNotIncludedFiles()
- {
+ public String[] getNotIncludedFiles() {
slowScan();
- return filesNotIncluded.toArray( EMPTY_STRING_ARRAY );
+ return filesNotIncluded.toArray(EMPTY_STRING_ARRAY);
}
/**
@@ -570,25 +499,23 @@ public String[] getNotIncludedFiles()
* exclude patterns.
* @see #slowScan
*/
- public String[] getExcludedFiles()
- {
+ public String[] getExcludedFiles() {
slowScan();
- return filesExcluded.toArray( EMPTY_STRING_ARRAY );
+ return filesExcluded.toArray(EMPTY_STRING_ARRAY);
}
/**
* Returns the names of the files which were selected out and therefore not ultimately included.
- * + * *The names are relative to the base directory. This involves performing a slow scan if one has not already been * completed.
* * @return the names of the files which were deselected. * @see #slowScan */ - public String[] getDeselectedFiles() - { + public String[] getDeselectedFiles() { slowScan(); - return filesDeselected.toArray( EMPTY_STRING_ARRAY ); + return filesDeselected.toArray(EMPTY_STRING_ARRAY); } /** @@ -599,9 +526,8 @@ public String[] getDeselectedFiles() * patterns. */ @Override - public String[] getIncludedDirectories() - { - return dirsIncluded.toArray( EMPTY_STRING_ARRAY ); + public String[] getIncludedDirectories() { + return dirsIncluded.toArray(EMPTY_STRING_ARRAY); } /** @@ -611,10 +537,9 @@ public String[] getIncludedDirectories() * @return the names of the directories which matched none of the include patterns. * @see #slowScan */ - public String[] getNotIncludedDirectories() - { + public String[] getNotIncludedDirectories() { slowScan(); - return dirsNotIncluded.toArray( EMPTY_STRING_ARRAY ); + return dirsNotIncluded.toArray(EMPTY_STRING_ARRAY); } /** @@ -626,30 +551,28 @@ public String[] getNotIncludedDirectories() * exclude patterns. * @see #slowScan */ - public String[] getExcludedDirectories() - { + public String[] getExcludedDirectories() { slowScan(); - return dirsExcluded.toArray( EMPTY_STRING_ARRAY ); + return dirsExcluded.toArray(EMPTY_STRING_ARRAY); } /** *Returns the names of the directories which were selected out and therefore not ultimately included.
- * + * *The names are relative to the base directory. This involves performing a slow scan if one has not already been * completed.
* * @return the names of the directories which were deselected. * @see #slowScan */ - public String[] getDeselectedDirectories() - { + public String[] getDeselectedDirectories() { slowScan(); - return dirsDeselected.toArray( EMPTY_STRING_ARRAY ); + return dirsDeselected.toArray(EMPTY_STRING_ARRAY); } /** *Checks whether a given file is a symbolic link.
- * + * *It doesn't really test for symbolic links but whether the canonical and absolute paths of the file are identical * - this may lead to false positives on some platforms. *
@@ -660,15 +583,13 @@ public String[] getDeselectedDirectories() * @throws java.io.IOException . * @since Ant 1.5 */ - public boolean isSymbolicLink( File parent, String name ) - throws IOException - { - return NioFiles.isSymbolicLink( new File( parent, name ) ); + public boolean isSymbolicLink(File parent, String name) throws IOException { + return NioFiles.isSymbolicLink(new File(parent, name)); } /** *Checks whether the parent of this file is a symbolic link.
- * + * *For java versions prior to 7 It doesn't really test for symbolic links but whether the canonical and absolute * paths of the file are identical - this may lead to false positives on some platforms.
* @@ -678,9 +599,7 @@ public boolean isSymbolicLink( File parent, String name ) * @throws java.io.IOException . * @since Ant 1.5 */ - public boolean isParentSymbolicLink( File parent, String name ) - throws IOException - { - return NioFiles.isSymbolicLink( parent ); + public boolean isParentSymbolicLink(File parent, String name) throws IOException { + return NioFiles.isSymbolicLink(parent); } } diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java index 8e1fda24..b6c83ef9 100644 --- a/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java +++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalkListener.java @@ -20,18 +20,17 @@ /** * Observes the actions of a {@link DirectoryWalker}. - * + * * * @see DirectoryWalker */ -public interface DirectoryWalkListener -{ +public interface DirectoryWalkListener { /** * The directory walking has begun. * * @param basedir the basedir that walk started in. */ - void directoryWalkStarting( File basedir ); + void directoryWalkStarting(File basedir); /** * The included entry that was encountered. @@ -39,12 +38,12 @@ public interface DirectoryWalkListener * @param percentage rough percentage of the walk completed. (inaccurate) * @param file the file that was included. */ - void directoryWalkStep( int percentage, File file ); + void directoryWalkStep(int percentage, File file); /** * The directory walking has finished. */ void directoryWalkFinished(); - void debug( String message ); + void debug(String message); } diff --git a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java index 2ffa4b0a..58142c50 100644 --- a/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java +++ b/src/main/java/org/codehaus/plexus/util/DirectoryWalker.java @@ -24,16 +24,14 @@ /** * DirectoryWalker - * + * * */ -public class DirectoryWalker -{ +public class DirectoryWalker { /** * DirStackEntry is an Item on the {@link DirectoryWalker#dirStack} */ - class DirStackEntry - { + class DirStackEntry { /** * Count of files in the directory. */ @@ -65,8 +63,7 @@ class DirStackEntry * @param d the directory to track * @param length the length of entries in the directory. */ - public DirStackEntry( File d, int length ) - { + public DirStackEntry(File d, int length) { dir = d; count = length; } @@ -76,9 +73,8 @@ public DirStackEntry( File d, int length ) * * @return the value for the next percentage offset. */ - public double getNextPercentageOffset() - { - return percentageOffset + ( index * ( percentageSize / count ) ); + public double getNextPercentageOffset() { + return percentageOffset + (index * (percentageSize / count)); } /** @@ -86,9 +82,8 @@ public double getNextPercentageOffset() * * @return the value for the next percentage size. */ - public double getNextPercentageSize() - { - return ( percentageSize / count ); + public double getNextPercentageSize() { + return (percentageSize / count); } /** @@ -96,19 +91,17 @@ public double getNextPercentageSize() * * @return the percentage right now. */ - public int getPercentage() - { + public int getPercentage() { double percentageWithinDir = (double) index / (double) count; - return (int) Math.floor( percentageOffset + ( percentageWithinDir * percentageSize ) ); + return (int) Math.floor(percentageOffset + (percentageWithinDir * percentageSize)); } @Override - public String toString() - { + public String toString() { return "DirStackEntry[" + "dir=" + dir.getAbsolutePath() + ",count=" + count + ",index=" + index - + ",percentageOffset=" + percentageOffset + ",percentageSize=" + percentageSize + ",percentage()=" - + getPercentage() + ",getNextPercentageOffset()=" + getNextPercentageOffset() - + ",getNextPercentageSize()=" + getNextPercentageSize() + "]"; + + ",percentageOffset=" + percentageOffset + ",percentageSize=" + percentageSize + ",percentage()=" + + getPercentage() + ",getNextPercentageOffset()=" + getNextPercentageOffset() + + ",getNextPercentageSize()=" + getNextPercentageSize() + "]"; } } @@ -128,137 +121,111 @@ public String toString() private boolean debugEnabled = false; - public DirectoryWalker() - { + public DirectoryWalker() { includes = new ArrayListExceptionUtils. Protected to discourage instantiation.
*/
- protected ExceptionUtils()
- {
- }
+ protected ExceptionUtils() {}
/**
*
@@ -106,13 +111,11 @@ protected ExceptionUtils()
*
* @param methodName the methodName to add to the list, null and empty strings are ignored
*/
- public static void addCauseMethodName( String methodName )
- {
- if ( methodName != null && methodName.length() > 0 )
- {
- List
* This class is public domain (not copyrighted).
* This class provides basic facilities for manipulating files and file paths. Methods exist to retrieve the components of a typical file path. For example
* There are also methods to {@link #catPath concatenate two paths}, {@link #resolveFile resolve a path relative to a
* File} and {@link #normalize} a path. There are methods to create a {@link #toFile File from a URL}, copy a {@link #copyFileToDirectory File to a
* directory}, copy a {@link #copyFile File to another File}, copy a {@link #copyURLToFile URL's contents to a File}, as
* well as methods to {@link #deleteDirectory(File) delete} and {@link #cleanDirectory(File) clean} a directory. Common {@link java.io.File} manipulation routines. Taken from the commons-utils repo. Also code from Alexandria's FileUtils. And from Avalon Excalibur's IO. And from
* Ant. Given a directory and an array of extensions return an array of compliant files. TODO Should an ignore list be passed in? TODO Should a recurse flag be passed in? The given extensions should be like "java" and not like ".java"Throwable.
* @throws NullPointerException if the throwable is null
*/
- public static Throwable getCause( Throwable throwable )
- {
- return getCause( throwable, CAUSE_METHOD_NAMES );
+ public static Throwable getCause(Throwable throwable) {
+ return getCause(throwable, CAUSE_METHOD_NAMES);
}
/**
@@ -163,23 +165,18 @@ public static Throwable getCause( Throwable throwable )
* @throws NullPointerException if the method names array is null or contains null
* @throws NullPointerException if the throwable is null
*/
- public static Throwable getCause( Throwable throwable, String[] methodNames )
- {
- Throwable cause = getCauseUsingWellKnownTypes( throwable );
- if ( cause == null )
- {
- for ( String methodName : methodNames )
- {
- cause = getCauseUsingMethodName( throwable, methodName );
- if ( cause != null )
- {
+ public static Throwable getCause(Throwable throwable, String[] methodNames) {
+ Throwable cause = getCauseUsingWellKnownTypes(throwable);
+ if (cause == null) {
+ for (String methodName : methodNames) {
+ cause = getCauseUsingMethodName(throwable, methodName);
+ if (cause != null) {
break;
}
}
- if ( cause == null )
- {
- cause = getCauseUsingFieldName( throwable, "detail" );
+ if (cause == null) {
+ cause = getCauseUsingFieldName(throwable, "detail");
}
}
return cause;
@@ -194,14 +191,11 @@ public static Throwable getCause( Throwable throwable, String[] methodNames )
* @param throwable the throwable to get the root cause for
* @return The root cause of the Throwable.
*/
- public static Throwable getRootCause( Throwable throwable )
- {
- Throwable cause = getCause( throwable );
- if ( cause != null )
- {
+ public static Throwable getRootCause(Throwable throwable) {
+ Throwable cause = getCause(throwable);
+ if (cause != null) {
throwable = cause;
- while ( ( throwable = getCause( throwable ) ) != null )
- {
+ while ((throwable = getCause(throwable)) != null) {
cause = throwable;
}
}
@@ -217,18 +211,12 @@ public static Throwable getRootCause( Throwable throwable )
* @param throwable the exception to examine
* @return The wrapped exception, or null if not found.
*/
- private static Throwable getCauseUsingWellKnownTypes( Throwable throwable )
- {
- if ( throwable instanceof SQLException )
- {
- return ( (SQLException) throwable ).getNextException();
- }
- else if ( throwable instanceof InvocationTargetException )
- {
- return ( (InvocationTargetException) throwable ).getTargetException();
- }
- else
- {
+ private static Throwable getCauseUsingWellKnownTypes(Throwable throwable) {
+ if (throwable instanceof SQLException) {
+ return ((SQLException) throwable).getNextException();
+ } else if (throwable instanceof InvocationTargetException) {
+ return ((InvocationTargetException) throwable).getTargetException();
+ } else {
return null;
}
}
@@ -242,34 +230,20 @@ else if ( throwable instanceof InvocationTargetException )
* @param methodName the name of the method to find and invoke
* @return The wrapped exception, or null if not found.
*/
- private static Throwable getCauseUsingMethodName( Throwable throwable, String methodName )
- {
+ private static Throwable getCauseUsingMethodName(Throwable throwable, String methodName) {
Method method = null;
- try
- {
- method = throwable.getClass().getMethod( methodName, null );
- }
- catch ( NoSuchMethodException ignored )
- {
- }
- catch ( SecurityException ignored )
- {
- }
-
- if ( method != null && Throwable.class.isAssignableFrom( method.getReturnType() ) )
- {
- try
- {
- return (Throwable) method.invoke( throwable, new Object[0] );
- }
- catch ( IllegalAccessException ignored )
- {
- }
- catch ( IllegalArgumentException ignored )
- {
- }
- catch ( InvocationTargetException ignored )
- {
+ try {
+ method = throwable.getClass().getMethod(methodName, null);
+ } catch (NoSuchMethodException ignored) {
+ } catch (SecurityException ignored) {
+ }
+
+ if (method != null && Throwable.class.isAssignableFrom(method.getReturnType())) {
+ try {
+ return (Throwable) method.invoke(throwable, new Object[0]);
+ } catch (IllegalAccessException ignored) {
+ } catch (IllegalArgumentException ignored) {
+ } catch (InvocationTargetException ignored) {
}
}
return null;
@@ -284,31 +258,19 @@ private static Throwable getCauseUsingMethodName( Throwable throwable, String me
* @param fieldName the name of the attribute to examine
* @return The wrapped exception, or null if not found.
*/
- private static Throwable getCauseUsingFieldName( Throwable throwable, String fieldName )
- {
+ private static Throwable getCauseUsingFieldName(Throwable throwable, String fieldName) {
Field field = null;
- try
- {
- field = throwable.getClass().getField( fieldName );
- }
- catch ( NoSuchFieldException ignored )
- {
- }
- catch ( SecurityException ignored )
- {
+ try {
+ field = throwable.getClass().getField(fieldName);
+ } catch (NoSuchFieldException ignored) {
+ } catch (SecurityException ignored) {
}
- if ( field != null && Throwable.class.isAssignableFrom( field.getType() ) )
- {
- try
- {
- return (Throwable) field.get( throwable );
- }
- catch ( IllegalAccessException ignored )
- {
- }
- catch ( IllegalArgumentException ignored )
- {
+ if (field != null && Throwable.class.isAssignableFrom(field.getType())) {
+ try {
+ return (Throwable) field.get(throwable);
+ } catch (IllegalAccessException ignored) {
+ } catch (IllegalArgumentException ignored) {
}
}
return null;
@@ -322,14 +284,12 @@ private static Throwable getCauseUsingFieldName( Throwable throwable, String fie
* @param throwable the exception to inspect
* @return The throwable count.
*/
- public static int getThrowableCount( Throwable throwable )
- {
+ public static int getThrowableCount(Throwable throwable) {
// Count the number of throwables
int count = 0;
- while ( throwable != null )
- {
+ while (throwable != null) {
count++;
- throwable = ExceptionUtils.getCause( throwable );
+ throwable = ExceptionUtils.getCause(throwable);
}
return count;
}
@@ -342,15 +302,13 @@ public static int getThrowableCount( Throwable throwable )
* @param throwable the exception to inspect
* @return The list of Throwable objects.
*/
- public static Throwable[] getThrowables( Throwable throwable )
- {
+ public static Throwable[] getThrowables(Throwable throwable) {
ListfromIndex argument is negative or not less than the count
* of Throwables in the chain.
*/
- public static int indexOfThrowable( Throwable throwable, Class type, int fromIndex )
- {
- if ( fromIndex < 0 )
- {
- throw new IndexOutOfBoundsException( "Throwable index out of range: " + fromIndex );
+ public static int indexOfThrowable(Throwable throwable, Class type, int fromIndex) {
+ if (fromIndex < 0) {
+ throw new IndexOutOfBoundsException("Throwable index out of range: " + fromIndex);
}
- Throwable[] throwables = ExceptionUtils.getThrowables( throwable );
- if ( fromIndex >= throwables.length )
- {
- throw new IndexOutOfBoundsException( "Throwable index out of range: " + fromIndex );
+ Throwable[] throwables = ExceptionUtils.getThrowables(throwable);
+ if (fromIndex >= throwables.length) {
+ throw new IndexOutOfBoundsException("Throwable index out of range: " + fromIndex);
}
- for ( int i = fromIndex; i < throwables.length; i++ )
- {
- if ( throwables[i].getClass().equals( type ) )
- {
+ for (int i = fromIndex; i < throwables.length; i++) {
+ if (throwables[i].getClass().equals(type)) {
return i;
}
}
@@ -412,12 +364,10 @@ public static int indexOfThrowable( Throwable throwable, Class type, int fromInd
* @param t the exception
* @param stream the stream
*/
- public static void printRootCauseStackTrace( Throwable t, PrintStream stream )
- {
- String trace[] = getRootCauseStackTrace( t );
- for ( String aTrace : trace )
- {
- stream.println( aTrace );
+ public static void printRootCauseStackTrace(Throwable t, PrintStream stream) {
+ String trace[] = getRootCauseStackTrace(t);
+ for (String aTrace : trace) {
+ stream.println(aTrace);
}
stream.flush();
}
@@ -426,9 +376,8 @@ public static void printRootCauseStackTrace( Throwable t, PrintStream stream )
* Equivalent to printRootCauseStackTrace(t, System.err)
* @param t the exception
*/
- public static void printRootCauseStackTrace( Throwable t )
- {
- printRootCauseStackTrace( t, System.err );
+ public static void printRootCauseStackTrace(Throwable t) {
+ printRootCauseStackTrace(t, System.err);
}
/**
@@ -436,12 +385,10 @@ public static void printRootCauseStackTrace( Throwable t )
* @param t the cause
* @param writer the writer
*/
- public static void printRootCauseStackTrace( Throwable t, PrintWriter writer )
- {
- String trace[] = getRootCauseStackTrace( t );
- for ( String aTrace : trace )
- {
- writer.println( aTrace );
+ public static void printRootCauseStackTrace(Throwable t, PrintWriter writer) {
+ String trace[] = getRootCauseStackTrace(t);
+ for (String aTrace : trace) {
+ writer.println(aTrace);
}
writer.flush();
}
@@ -452,34 +399,27 @@ public static void printRootCauseStackTrace( Throwable t, PrintWriter writer )
* @param t the cause
* @return the Stack
*/
- public static String[] getRootCauseStackTrace( Throwable t )
- {
- Throwable[] throwables = getThrowables( t );
+ public static String[] getRootCauseStackTrace(Throwable t) {
+ Throwable[] throwables = getThrowables(t);
int count = throwables.length;
ArrayListThrowable.
* @return The stack trace as generated by the exception's printStackTrace(PrintWriter) method.
*/
- public static String getStackTrace( Throwable t )
- {
+ public static String getStackTrace(Throwable t) {
StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter( sw, true );
- t.printStackTrace( pw );
+ PrintWriter pw = new PrintWriter(sw, true);
+ t.printStackTrace(pw);
return sw.getBuffer().toString();
}
@@ -527,16 +463,13 @@ public static String getStackTrace( Throwable t )
* @param t The Throwable.
* @return The nested stack trace, with the root cause first.
*/
- public static String getFullStackTrace( Throwable t )
- {
+ public static String getFullStackTrace(Throwable t) {
StringWriter sw = new StringWriter();
- PrintWriter pw = new PrintWriter( sw, true );
- Throwable[] ts = getThrowables( t );
- for ( Throwable t1 : ts )
- {
- t1.printStackTrace( pw );
- if ( isNestedThrowable( t1 ) )
- {
+ PrintWriter pw = new PrintWriter(sw, true);
+ Throwable[] ts = getThrowables(t);
+ for (Throwable t1 : ts) {
+ t1.printStackTrace(pw);
+ if (isNestedThrowable(t1)) {
break;
}
}
@@ -549,53 +482,35 @@ public static String getFullStackTrace( Throwable t )
* @param throwable The Throwable.
* @return boolean true/false
*/
- public static boolean isNestedThrowable( Throwable throwable )
- {
- if ( throwable == null )
- {
+ public static boolean isNestedThrowable(Throwable throwable) {
+ if (throwable == null) {
return false;
}
- if ( throwable instanceof SQLException )
- {
+ if (throwable instanceof SQLException) {
return true;
- }
- else if ( throwable instanceof InvocationTargetException )
- {
+ } else if (throwable instanceof InvocationTargetException) {
return true;
}
- for ( String CAUSE_METHOD_NAME : CAUSE_METHOD_NAMES )
- {
- try
- {
- Method method = throwable.getClass().getMethod( CAUSE_METHOD_NAME, null );
- if ( method != null )
- {
+ for (String CAUSE_METHOD_NAME : CAUSE_METHOD_NAMES) {
+ try {
+ Method method = throwable.getClass().getMethod(CAUSE_METHOD_NAME, null);
+ if (method != null) {
return true;
}
- }
- catch ( NoSuchMethodException ignored )
- {
- }
- catch ( SecurityException ignored )
- {
+ } catch (NoSuchMethodException ignored) {
+ } catch (SecurityException ignored) {
}
}
- try
- {
- Field field = throwable.getClass().getField( "detail" );
- if ( field != null )
- {
+ try {
+ Field field = throwable.getClass().getField("detail");
+ if (field != null) {
return true;
}
- }
- catch ( NoSuchFieldException ignored )
- {
- }
- catch ( SecurityException ignored )
- {
+ } catch (NoSuchFieldException ignored) {
+ } catch (SecurityException ignored) {
}
return false;
@@ -608,24 +523,21 @@ else if ( throwable instanceof InvocationTargetException )
* @param t The Throwable.
* @return An array of strings describing each stack frame.
*/
- public static String[] getStackFrames( Throwable t )
- {
- return getStackFrames( getStackTrace( t ) );
+ public static String[] getStackFrames(Throwable t) {
+ return getStackFrames(getStackTrace(t));
}
/**
* Functionality shared between the getStackFrames(Throwable) methods of this and the classes.
*/
- static String[] getStackFrames( String stackTrace )
- {
- String linebreak = System.getProperty( "line.separator" );
- StringTokenizer frames = new StringTokenizer( stackTrace, linebreak );
+ static String[] getStackFrames(String stackTrace) {
+ String linebreak = System.getProperty("line.separator");
+ StringTokenizer frames = new StringTokenizer(stackTrace, linebreak);
List256 entries.
*/
- public FastMap()
- {
- initialize( 256 );
+ public FastMap() {
+ initialize(256);
}
/**
* Creates a {@link FastMap}, copy of the specified Map. If the specified map is not an instance of
* {@link FastMap}, the newly created map has a capacity set to the specified map's size. The copy has the same
* order as the original, regardless of the original map's implementation:
- *
+ *
*
* TreeMap dictionary = ...;
* FastMap dictionaryLookup = new FastMap(dictionary);
*
- *
+ *
* @param map the map whose mappings are to be placed in this map.
*/
- public FastMap( Map map )
- {
- int capacity = ( map instanceof FastMap ) ? ( (FastMap) map ).capacity() : map.size();
- initialize( capacity );
- putAll( map );
+ public FastMap(Map map) {
+ int capacity = (map instanceof FastMap) ? ((FastMap) map).capacity() : map.size();
+ initialize(capacity);
+ putAll(map);
}
/**
* Creates a {@link FastMap} with the specified capacity. Unless the capacity is exceeded, operations on this map do
* not allocate entries. For optimum performance, the capacity should be of the same order of magnitude or larger
* than the expected map's size.
- *
+ *
* @param capacity the number of buckets in the hash table; it also defines the number of pre-allocated entries.
*/
- public FastMap( int capacity )
- {
- initialize( capacity );
+ public FastMap(int capacity) {
+ initialize(capacity);
}
/**
@@ -137,8 +132,7 @@ public FastMap( int capacity )
* @return this map's size.
*/
@Override
- public int size()
- {
+ public int size() {
return _size;
}
@@ -148,8 +142,7 @@ public int size()
*
* @return this map's capacity.
*/
- public int capacity()
- {
+ public int capacity() {
return _capacity;
}
@@ -159,8 +152,7 @@ public int capacity()
* @return true if this map contains no key-value mappings; false otherwise.
*/
@Override
- public boolean isEmpty()
- {
+ public boolean isEmpty() {
return _size == 0;
}
@@ -172,13 +164,10 @@ public boolean isEmpty()
* @throws NullPointerException if the key is null.
*/
@Override
- public boolean containsKey( Object key )
- {
- EntryImpl entry = _entries[keyHash( key ) & _mask];
- while ( entry != null )
- {
- if ( key.equals( entry._key ) )
- {
+ public boolean containsKey(Object key) {
+ EntryImpl entry = _entries[keyHash(key) & _mask];
+ while (entry != null) {
+ if (key.equals(entry._key)) {
return true;
}
entry = entry._next;
@@ -194,13 +183,10 @@ public boolean containsKey( Object key )
* @throws NullPointerException if the key is null.
*/
@Override
- public boolean containsValue( Object value )
- {
+ public boolean containsValue(Object value) {
EntryImpl entry = _mapFirst;
- while ( entry != null )
- {
- if ( value.equals( entry._value ) )
- {
+ while (entry != null) {
+ if (value.equals(entry._value)) {
return true;
}
entry = entry._after;
@@ -217,13 +203,10 @@ public boolean containsValue( Object value )
* @throws NullPointerException if key is null.
*/
@Override
- public V get( Object key )
- {
- EntryImplnull if none.
*/
- public Map.Entry getEntry( Object key )
- {
- EntryImpl entry = _entries[keyHash( key ) & _mask];
- while ( entry != null )
- {
- if ( key.equals( entry._key ) )
- {
+ public Map.Entry getEntry(Object key) {
+ EntryImpl entry = _entries[keyHash(key) & _mask];
+ while (entry != null) {
+ if (key.equals(entry._key)) {
return entry;
}
entry = entry._next;
@@ -263,13 +243,10 @@ public Map.Entry getEntry( Object key )
* @throws NullPointerException if the key is null.
*/
@Override
- public Object put( Object key, Object value )
- {
- EntryImpl entry = _entries[keyHash( key ) & _mask];
- while ( entry != null )
- {
- if ( key.equals( entry._key ) )
- {
+ public Object put(Object key, Object value) {
+ EntryImpl entry = _entries[keyHash(key) & _mask];
+ while (entry != null) {
+ if (key.equals(entry._key)) {
Object prevValue = entry._value;
entry._value = value;
return prevValue;
@@ -277,7 +254,7 @@ public Object put( Object key, Object value )
entry = entry._next;
}
// No previous mapping.
- addEntry( key, value );
+ addEntry(key, value);
return null;
}
@@ -289,11 +266,9 @@ public Object put( Object key, Object value )
* null keys.
*/
@Override
- public void putAll( Map map )
- {
- for ( Entry entry : map.entrySet() )
- {
- addEntry( entry.getKey(), entry.getValue() );
+ public void putAll(Map map) {
+ for (Entry entry : map.entrySet()) {
+ addEntry(entry.getKey(), entry.getValue());
}
}
@@ -307,15 +282,12 @@ public void putAll( Map map )
* @throws NullPointerException if the key is null.
*/
@Override
- public V remove( Object key )
- {
- EntryImpltrue if the specified object is equal to this map; false otherwise.
*/
@Override
- public boolean equals( Object obj )
- {
- if ( obj == this )
- {
+ public boolean equals(Object obj) {
+ if (obj == this) {
return true;
- }
- else if ( obj instanceof Map )
- {
+ } else if (obj instanceof Map) {
Map that = (Map) obj;
- if ( this.size() == that.size() )
- {
+ if (this.size() == that.size()) {
EntryImpl entry = _mapFirst;
- while ( entry != null )
- {
- if ( !that.entrySet().contains( entry ) )
- {
+ while (entry != null) {
+ if (!that.entrySet().contains(entry)) {
return false;
}
entry = entry._after;
}
return true;
- }
- else
- {
+ } else {
return false;
}
- }
- else
- {
+ } else {
return false;
}
}
@@ -490,12 +431,10 @@ else if ( obj instanceof Map )
* @return the hash code value for this map.
*/
@Override
- public int hashCode()
- {
+ public int hashCode() {
int code = 0;
EntryImpl entry = _mapFirst;
- while ( entry != null )
- {
+ while (entry != null) {
code += entry.hashCode();
entry = entry._after;
}
@@ -508,8 +447,7 @@ public int hashCode()
* @return this.entrySet().toString();
*/
@Override
- public String toString()
- {
+ public String toString() {
return entrySet().toString();
}
@@ -523,40 +461,32 @@ public String toString()
* @return a collection view of the values contained in this map.
*/
@Override
- public Collection values()
- {
+ public Collection values() {
return _values;
}
private transient Values _values;
- private class Values
- extends AbstractCollection
- {
+ private class Values extends AbstractCollection {
@Override
- public Iterator iterator()
- {
- return new Iterator()
- {
+ public Iterator iterator() {
+ return new Iterator() {
EntryImpl after = _mapFirst;
EntryImpl before;
@Override
- public void remove()
- {
- removeEntry( before );
+ public void remove() {
+ removeEntry(before);
}
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
return after != null;
}
@Override
- public Object next()
- {
+ public Object next() {
before = after;
after = after._after;
return before._value;
@@ -565,20 +495,17 @@ public Object next()
}
@Override
- public int size()
- {
+ public int size() {
return _size;
}
@Override
- public boolean contains( Object o )
- {
- return containsValue( o );
+ public boolean contains(Object o) {
+ return containsValue(o);
}
@Override
- public void clear()
- {
+ public void clear() {
FastMap.this.clear();
}
}
@@ -594,40 +521,32 @@ public void clear()
* @return a collection view of the mappings contained in this map.
*/
@Override
- public Set entrySet()
- {
+ public Set entrySet() {
return _entrySet;
}
private transient EntrySet _entrySet;
- private class EntrySet
- extends AbstractSet
- {
+ private class EntrySet extends AbstractSet {
@Override
- public Iterator iterator()
- {
- return new Iterator()
- {
+ public Iterator iterator() {
+ return new Iterator() {
EntryImpl after = _mapFirst;
EntryImpl before;
@Override
- public void remove()
- {
- removeEntry( before );
+ public void remove() {
+ removeEntry(before);
}
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
return after != null;
}
@Override
- public Object next()
- {
+ public Object next() {
before = after;
after = after._after;
return before;
@@ -636,36 +555,28 @@ public Object next()
}
@Override
- public int size()
- {
+ public int size() {
return _size;
}
@Override
- public boolean contains( Object obj )
- { // Optimization.
- if ( obj instanceof Map.Entry )
- {
+ public boolean contains(Object obj) { // Optimization.
+ if (obj instanceof Map.Entry) {
Map.Entry entry = (Map.Entry) obj;
- Map.Entry mapEntry = getEntry( entry.getKey() );
- return entry.equals( mapEntry );
- }
- else
- {
+ Map.Entry mapEntry = getEntry(entry.getKey());
+ return entry.equals(mapEntry);
+ } else {
return false;
}
}
@Override
- public boolean remove( Object obj )
- { // Optimization.
- if ( obj instanceof Map.Entry )
- {
+ public boolean remove(Object obj) { // Optimization.
+ if (obj instanceof Map.Entry) {
Map.Entry entry = (Map.Entry) obj;
- EntryImpl mapEntry = (EntryImpl) getEntry( entry.getKey() );
- if ( ( mapEntry != null ) && ( entry.getValue() ).equals( mapEntry._value ) )
- {
- removeEntry( mapEntry );
+ EntryImpl mapEntry = (EntryImpl) getEntry(entry.getKey());
+ if ((mapEntry != null) && (entry.getValue()).equals(mapEntry._value)) {
+ removeEntry(mapEntry);
return true;
}
}
@@ -683,40 +594,32 @@ public boolean remove( Object obj )
* @return a set view of the keys contained in this map.
*/
@Override
- public Set keySet()
- {
+ public Set keySet() {
return _keySet;
}
private transient KeySet _keySet;
- private class KeySet
- extends AbstractSet
- {
+ private class KeySet extends AbstractSet {
@Override
- public Iterator iterator()
- {
- return new Iterator()
- {
+ public Iterator iterator() {
+ return new Iterator() {
EntryImpl after = _mapFirst;
EntryImpl before;
@Override
- public void remove()
- {
- removeEntry( before );
+ public void remove() {
+ removeEntry(before);
}
@Override
- public boolean hasNext()
- {
+ public boolean hasNext() {
return after != null;
}
@Override
- public Object next()
- {
+ public Object next() {
before = after;
after = after._after;
return before._key;
@@ -725,26 +628,22 @@ public Object next()
}
@Override
- public int size()
- {
+ public int size() {
return _size;
}
@Override
- public boolean contains( Object obj )
- { // Optimization.
- return FastMap.this.containsKey( obj );
+ public boolean contains(Object obj) { // Optimization.
+ return FastMap.this.containsKey(obj);
}
@Override
- public boolean remove( Object obj )
- { // Optimization.
- return FastMap.this.remove( obj ) != null;
+ public boolean remove(Object obj) { // Optimization.
+ return FastMap.this.remove(obj) != null;
}
@Override
- public void clear()
- { // Optimization.
+ public void clear() { // Optimization.
FastMap.this.clear();
}
}
@@ -753,7 +652,7 @@ public void clear()
* This methods is being called when the size of this {@link FastMap} has changed. The default behavior is to double
* the map's capacity when the map's size reaches the current map's capacity. Sub-class may override this method to
* implement custom resizing policies or to disable automatic resizing. For example:
- *
+ *
*
* Map fixedCapacityMap = new FastMap( 256 )
* {
@@ -763,77 +662,66 @@ public void clear()
* }
* };
*
- *
+ *
* @see #setCapacity
*/
- protected void sizeChanged()
- {
- if ( size() > capacity() )
- {
- setCapacity( capacity() * 2 );
+ protected void sizeChanged() {
+ if (size() > capacity()) {
+ setCapacity(capacity() * 2);
}
}
/**
* Returns the hash code for the specified key. The formula being used is identical to the formula used by
* java.util.HashMap (ensures similar behavior for ill-conditioned hashcode keys).
- *
+ *
* @param key the key to calculate the hashcode for.
* @return the hash code for the specified key.
*/
- private static int keyHash( Object key )
- {
+ private static int keyHash(Object key) {
// From HashMap.hash(Object) function.
int hashCode = key.hashCode();
- hashCode += ~( hashCode << 9 );
- hashCode ^= ( hashCode >>> 14 );
- hashCode += ( hashCode << 4 );
- hashCode ^= ( hashCode >>> 10 );
+ hashCode += ~(hashCode << 9);
+ hashCode ^= (hashCode >>> 14);
+ hashCode += (hashCode << 4);
+ hashCode ^= (hashCode >>> 10);
return hashCode;
}
/**
* Adds a new entry for the specified key and value.
- *
+ *
* @param key the entry's key.
* @param value the entry's value.
*/
- private void addEntry( Object key, Object value )
- {
+ private void addEntry(Object key, Object value) {
EntryImpl entry = _poolFirst;
- if ( entry != null )
- {
+ if (entry != null) {
_poolFirst = entry._after;
entry._after = null;
- }
- else
- { // Pool empty.
+ } else { // Pool empty.
entry = new EntryImpl();
}
// Setup entry parameters.
entry._key = key;
entry._value = value;
- int index = keyHash( key ) & _mask;
+ int index = keyHash(key) & _mask;
entry._index = index;
// Connects to bucket.
EntryImpl next = _entries[index];
entry._next = next;
- if ( next != null )
- {
+ if (next != null) {
next._previous = entry;
}
_entries[index] = entry;
// Connects to collection.
- if ( _mapLast != null )
- {
+ if (_mapLast != null) {
entry._before = _mapLast;
_mapLast._after = entry;
- }
- else
- {
+ } else {
_mapFirst = entry;
}
_mapLast = entry;
@@ -845,26 +733,21 @@ private void addEntry( Object key, Object value )
/**
* Removes the specified entry from the map.
- *
+ *
* @param entry the entry to be removed.
*/
- private void removeEntry( EntryImpl entry )
- {
+ private void removeEntry(EntryImpl entry) {
// Removes from bucket.
EntryImpl previous = entry._previous;
EntryImpl next = entry._next;
- if ( previous != null )
- {
+ if (previous != null) {
previous._next = next;
entry._previous = null;
- }
- else
- { // First in bucket.
+ } else { // First in bucket.
_entries[entry._index] = next;
}
- if ( next != null )
- {
+ if (next != null) {
next._previous = previous;
entry._next = null;
} // Else do nothing, no last pointer.
@@ -872,21 +755,15 @@ private void removeEntry( EntryImpl entry )
// Removes from collection.
EntryImpl before = entry._before;
EntryImpl after = entry._after;
- if ( before != null )
- {
+ if (before != null) {
before._after = after;
entry._before = null;
- }
- else
- { // First in collection.
+ } else { // First in collection.
_mapFirst = after;
}
- if ( after != null )
- {
+ if (after != null) {
after._before = before;
- }
- else
- { // Last in collection.
+ } else { // Last in collection.
_mapLast = before;
}
@@ -906,15 +783,13 @@ private void removeEntry( EntryImpl entry )
/**
* Initializes this instance for the specified capacity. Once initialized, operations on this map should not create
* new objects (unless the map's size exceeds the specified capacity).
- *
+ *
* @param capacity the initial capacity.
*/
- private void initialize( int capacity )
- {
+ private void initialize(int capacity) {
// Find a power of 2 >= capacity
int tableLength = 16;
- while ( tableLength < capacity )
- {
+ while (tableLength < capacity) {
tableLength <<= 1;
}
// Allocates hash table.
@@ -931,8 +806,7 @@ private void initialize( int capacity )
_mapFirst = null;
_mapLast = null;
// Allocates entries.
- for ( int i = 0; i < capacity; i++ )
- {
+ for (int i = 0; i < capacity; i++) {
EntryImpl entry = new EntryImpl();
entry._after = _poolFirst;
_poolFirst = entry;
@@ -946,17 +820,14 @@ private void initialize( int capacity )
* @throws IOException if an I/O error occurs.
* @throws ClassNotFoundException if the class for the object de-serialized is not found.
*/
- private void readObject( ObjectInputStream stream )
- throws IOException, ClassNotFoundException
- {
+ private void readObject(ObjectInputStream stream) throws IOException, ClassNotFoundException {
int capacity = stream.readInt();
- initialize( capacity );
+ initialize(capacity);
int size = stream.readInt();
- for ( int i = 0; i < size; i++ )
- {
+ for (int i = 0; i < size; i++) {
Object key = stream.readObject();
Object value = stream.readObject();
- addEntry( key, value );
+ addEntry(key, value);
}
}
@@ -966,32 +837,26 @@ private void readObject( ObjectInputStream stream )
* @param stream the object output stream.
* @throws IOException if an I/O error occurs.
*/
- private void writeObject( ObjectOutputStream stream )
- throws IOException
- {
- stream.writeInt( _capacity );
- stream.writeInt( _size );
+ private void writeObject(ObjectOutputStream stream) throws IOException {
+ stream.writeInt(_capacity);
+ stream.writeInt(_size);
int count = 0;
EntryImpl entry = _mapFirst;
- while ( entry != null )
- {
- stream.writeObject( entry._key );
- stream.writeObject( entry._value );
+ while (entry != null) {
+ stream.writeObject(entry._key);
+ stream.writeObject(entry._value);
count++;
entry = entry._after;
}
- if ( count != _size )
- {
- throw new IOException( "FastMap Corrupted" );
+ if (count != _size) {
+ throw new IOException("FastMap Corrupted");
}
}
/**
* This class represents a {@link FastMap} entry.
*/
- private static final class EntryImpltrue if both entry are considered equal; false otherwise.
*/
@Override
- public boolean equals( Object that )
- {
- if ( that instanceof Map.Entry )
- {
+ public boolean equals(Object that) {
+ if (that instanceof Map.Entry) {
Map.Entry entry = (Map.Entry) that;
- return ( _key.equals( entry.getKey() ) )
- && ( ( _value != null ) ? _value.equals( entry.getValue() ) : ( entry.getValue() == null ) );
- }
- else
- {
+ return (_key.equals(entry.getKey()))
+ && ((_value != null) ? _value.equals(entry.getValue()) : (entry.getValue() == null));
+ } else {
return false;
}
}
/**
* Returns the hash code for this entry.
- *
+ *
* @return this entry's hash code.
*/
@Override
- public int hashCode()
- {
- return _key.hashCode() ^ ( ( _value != null ) ? _value.hashCode() : 0 );
+ public int hashCode() {
+ return _key.hashCode() ^ ((_value != null) ? _value.hashCode() : 0);
}
/**
* Returns the text representation of this entry.
- *
+ *
* @return this entry's textual representation.
*/
@Override
- public String toString()
- {
+ public String toString() {
return _key + "=" + _value;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/codehaus/plexus/util/FileUtils.java b/src/main/java/org/codehaus/plexus/util/FileUtils.java
index 4dca8b3c..fceb191e 100644
--- a/src/main/java/org/codehaus/plexus/util/FileUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/FileUtils.java
@@ -55,14 +55,10 @@
*
*/
-import org.codehaus.plexus.util.io.InputStreamFacade;
-import org.codehaus.plexus.util.io.URLInputStreamFacade;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Reader;
@@ -70,6 +66,7 @@
import java.net.URL;
import java.nio.charset.Charset;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.security.SecureRandom;
@@ -79,11 +76,14 @@
import java.util.List;
import java.util.Random;
+import org.codehaus.plexus.util.io.InputStreamFacade;
+import org.codehaus.plexus.util.io.URLInputStreamFacade;
+
/**
* /www/hosted/mysite/index.html, can be broken into:
*
@@ -94,15 +94,15 @@
*
* File manager.
*/
- public static File getFile( String fileName )
- {
- return new File( fileName );
+ public static File getFile(String fileName) {
+ return new File(fileName);
}
/**
* File object, or null if the URL's protocol is not
* file
*/
- public static File toFile( final URL url )
- {
- if ( url == null || !url.getProtocol().equalsIgnoreCase( "file" ) )
- {
+ public static File toFile(final URL url) {
+ if (url == null || !url.getProtocol().equalsIgnoreCase("file")) {
return null;
}
- String filename = url.getFile().replace( '/', File.separatorChar );
+ String filename = url.getFile().replace('/', File.separatorChar);
int pos = -1;
- while ( ( pos = filename.indexOf( '%', pos + 1 ) ) >= 0 )
- {
- if ( pos + 2 < filename.length() )
- {
- String hexStr = filename.substring( pos + 1, pos + 3 );
- char ch = (char) Integer.parseInt( hexStr, 16 );
- filename = filename.substring( 0, pos ) + ch + filename.substring( pos + 3 );
+ while ((pos = filename.indexOf('%', pos + 1)) >= 0) {
+ if (pos + 2 < filename.length()) {
+ String hexStr = filename.substring(pos + 1, pos + 3);
+ char ch = (char) Integer.parseInt(hexStr, 16);
+ filename = filename.substring(0, pos) + ch + filename.substring(pos + 3);
}
}
- return new File( filename );
+ return new File(filename);
}
/**
@@ -768,13 +632,10 @@ public static File toFile( final URL url )
* @return the array of URLs
* @throws IOException if an error occurs
*/
- public static URL[] toURLs( final File[] files )
- throws IOException
- {
+ public static URL[] toURLs(final File[] files) throws IOException {
final URL[] urls = new URL[files.length];
- for ( int i = 0; i < urls.length; i++ )
- {
+ for (int i = 0; i < urls.length; i++) {
urls[i] = files[i].toURI().toURL();
}
@@ -783,7 +644,7 @@ public static URL[] toURLs( final File[] files )
/**
* Remove extension from filename. ie
- *
+ *
*
* foo.txt --> foo
* a\b\c.jpg --> a\b\c
@@ -793,22 +654,20 @@ public static URL[] toURLs( final File[] files )
* @param filename the path of the file
* @return the filename minus extension
*/
- public static String removeExtension( final String filename )
- {
- String ext = extension( filename );
+ public static String removeExtension(final String filename) {
+ String ext = extension(filename);
- if ( "".equals( ext ) )
- {
+ if ("".equals(ext)) {
return filename;
}
- final int index = filename.lastIndexOf( ext ) - 1;
- return filename.substring( 0, index );
+ final int index = filename.lastIndexOf(ext) - 1;
+ return filename.substring(0, index);
}
/**
* Get extension from filename. ie
- *
+ *
*
* foo.txt --> "txt"
* a\b\c.jpg --> "jpg"
@@ -818,14 +677,13 @@ public static String removeExtension( final String filename )
* @param filename the path of the file
* @return the extension of filename or "" if none
*/
- public static String getExtension( final String filename )
- {
- return extension( filename );
+ public static String getExtension(final String filename) {
+ return extension(filename);
}
/**
* Remove path from filename. Equivalent to the unix command basename ie.
- *
+ *
*
* a/b/c.txt --> c.txt
* a.txt --> a.txt
@@ -834,14 +692,13 @@ public static String getExtension( final String filename )
* @param filepath the path of the file
* @return the filename minus path
*/
- public static String removePath( final String filepath )
- {
- return removePath( filepath, File.separatorChar );
+ public static String removePath(final String filepath) {
+ return removePath(filepath, File.separatorChar);
}
/**
* Remove path from filename. ie.
- *
+ *
*
* a/b/c.txt --> c.txt
* a.txt --> a.txt
@@ -851,21 +708,19 @@ public static String removePath( final String filepath )
* @param fileSeparatorChar the file separator character like / on Unix platforms.
* @return the filename minus path
*/
- public static String removePath( final String filepath, final char fileSeparatorChar )
- {
- final int index = filepath.lastIndexOf( fileSeparatorChar );
+ public static String removePath(final String filepath, final char fileSeparatorChar) {
+ final int index = filepath.lastIndexOf(fileSeparatorChar);
- if ( -1 == index )
- {
+ if (-1 == index) {
return filepath;
}
- return filepath.substring( index + 1 );
+ return filepath.substring(index + 1);
}
/**
* Get path from filename. Roughly equivalent to the unix command dirname. ie.
- *
+ *
*
* a/b/c.txt --> a/b
* a.txt --> ""
@@ -874,14 +729,13 @@ public static String removePath( final String filepath, final char fileSeparator
* @param filepath the filepath
* @return the filename minus path
*/
- public static String getPath( final String filepath )
- {
- return getPath( filepath, File.separatorChar );
+ public static String getPath(final String filepath) {
+ return getPath(filepath, File.separatorChar);
}
/**
* Get path from filename. ie.
- *
+ *
*
* a/b/c.txt --> a/b
* a.txt --> ""
@@ -891,15 +745,13 @@ public static String getPath( final String filepath )
* @param fileSeparatorChar the file separator character like / on Unix platforms.
* @return the filename minus path
*/
- public static String getPath( final String filepath, final char fileSeparatorChar )
- {
- final int index = filepath.lastIndexOf( fileSeparatorChar );
- if ( -1 == index )
- {
+ public static String getPath(final String filepath, final char fileSeparatorChar) {
+ final int index = filepath.lastIndexOf(fileSeparatorChar);
+ if (-1 == index) {
return "";
}
- return filepath.substring( 0, index );
+ return filepath.substring(0, index);
}
/**
@@ -914,10 +766,8 @@ public static String getPath( final String filepath, final char fileSeparatorCha
* @throws IOException if source does not exist, the file in destinationDirectory cannot
* be written to, or an IO error occurs during copying.
*/
- public static void copyFileToDirectory( final String source, final String destinationDirectory )
- throws IOException
- {
- copyFileToDirectory( new File( source ), new File( destinationDirectory ) );
+ public static void copyFileToDirectory(final String source, final String destinationDirectory) throws IOException {
+ copyFileToDirectory(new File(source), new File(destinationDirectory));
}
/**
@@ -932,10 +782,9 @@ public static void copyFileToDirectory( final String source, final String destin
* @throws IOException if source does not exist, the file in destinationDirectory cannot
* be written to, or an IO error occurs during copying.
*/
- public static void copyFileToDirectoryIfModified( final String source, final String destinationDirectory )
- throws IOException
- {
- copyFileToDirectoryIfModified( new File( source ), new File( destinationDirectory ) );
+ public static void copyFileToDirectoryIfModified(final String source, final String destinationDirectory)
+ throws IOException {
+ copyFileToDirectoryIfModified(new File(source), new File(destinationDirectory));
}
/**
@@ -950,15 +799,12 @@ public static void copyFileToDirectoryIfModified( final String source, final Str
* @throws IOException if source does not exist, the file in destinationDirectory cannot
* be written to, or an IO error occurs during copying.
*/
- public static void copyFileToDirectory( final File source, final File destinationDirectory )
- throws IOException
- {
- if ( destinationDirectory.exists() && !destinationDirectory.isDirectory() )
- {
- throw new IllegalArgumentException( "Destination is not a directory" );
+ public static void copyFileToDirectory(final File source, final File destinationDirectory) throws IOException {
+ if (destinationDirectory.exists() && !destinationDirectory.isDirectory()) {
+ throw new IllegalArgumentException("Destination is not a directory");
}
- copyFile( source, new File( destinationDirectory, source.getName() ) );
+ copyFile(source, new File(destinationDirectory, source.getName()));
}
/**
@@ -973,39 +819,31 @@ public static void copyFileToDirectory( final File source, final File destinatio
* @throws IOException if source does not exist, the file in destinationDirectory cannot
* be written to, or an IO error occurs during copying.
*/
- public static void copyFileToDirectoryIfModified( final File source, final File destinationDirectory )
- throws IOException
- {
- if ( destinationDirectory.exists() && !destinationDirectory.isDirectory() )
- {
- throw new IllegalArgumentException( "Destination is not a directory" );
+ public static void copyFileToDirectoryIfModified(final File source, final File destinationDirectory)
+ throws IOException {
+ if (destinationDirectory.exists() && !destinationDirectory.isDirectory()) {
+ throw new IllegalArgumentException("Destination is not a directory");
}
- copyFileIfModified( source, new File( destinationDirectory, source.getName() ) );
+ copyFileIfModified(source, new File(destinationDirectory, source.getName()));
}
/**
* Creates a number of directories, as delivered from DirectoryScanner
- *
+ *
* @param sourceBase The basedir used for the directory scan
* @param dirs The getIncludedDirs from the dirscanner
* @param destination The base dir of the output structure
* @throws IOException io issue
*/
- public static void mkDirs( final File sourceBase, String[] dirs, final File destination )
- throws IOException
- {
- for ( String dir : dirs )
- {
- File src = new File( sourceBase, dir );
- File dst = new File( destination, dir );
- if ( NioFiles.isSymbolicLink( src ) )
- {
- File target = NioFiles.readSymbolicLink( src );
- NioFiles.createSymbolicLink( dst, target );
- }
- else
- {
+ public static void mkDirs(final File sourceBase, String[] dirs, final File destination) throws IOException {
+ for (String dir : dirs) {
+ File src = new File(sourceBase, dir);
+ File dst = new File(destination, dir);
+ if (NioFiles.isSymbolicLink(src)) {
+ File target = NioFiles.readSymbolicLink(src);
+ NioFiles.createSymbolicLink(dst, target);
+ } else {
dst.mkdirs();
}
}
@@ -1022,43 +860,34 @@ public static void mkDirs( final File sourceBase, String[] dirs, final File dest
* @throws java.io.FileNotFoundException if destination is a directory (use
* {@link #copyFileToDirectory}).
*/
- public static void copyFile( final File source, final File destination )
- throws IOException
- {
+ public static void copyFile(final File source, final File destination) throws IOException {
// check source exists
- if ( !source.exists() )
- {
+ if (!source.exists()) {
final String message = "File " + source + " does not exist";
- throw new IOException( message );
+ throw new IOException(message);
}
// check source != destination, see PLXUTILS-10
- if ( source.getCanonicalPath().equals( destination.getCanonicalPath() ) )
- {
+ if (source.getCanonicalPath().equals(destination.getCanonicalPath())) {
// if they are equal, we can exit the method without doing any work
return;
}
- mkdirsFor( destination );
+ mkdirsFor(destination);
- doCopyFile( source, destination );
+ doCopyFile(source, destination);
- if ( source.length() != destination.length() )
- {
+ if (source.length() != destination.length()) {
String message = "Failed to copy full contents from " + source + " to " + destination;
- throw new IOException( message );
+ throw new IOException(message);
}
}
- private static void doCopyFile( File source, File destination )
- throws IOException
- {
- doCopyFileUsingNewIO( source, destination );
+ private static void doCopyFile(File source, File destination) throws IOException {
+ doCopyFileUsingNewIO(source, destination);
}
- private static void doCopyFileUsingNewIO( File source, File destination )
- throws IOException
- {
- NioFiles.copy( source, destination );
+ private static void doCopyFileUsingNewIO(File source, File destination) throws IOException {
+ NioFiles.copy(source, destination);
}
/**
@@ -1072,25 +901,21 @@ private static void doCopyFileUsingNewIO( File source, File destination )
* @throws java.io.FileNotFoundException if destination is a directory (use
* {@link #copyFileToDirectory}).
*/
- public static void linkFile( final File source, final File destination )
- throws IOException
- {
+ public static void linkFile(final File source, final File destination) throws IOException {
// check source exists
- if ( !source.exists() )
- {
+ if (!source.exists()) {
final String message = "File " + source + " does not exist";
- throw new IOException( message );
+ throw new IOException(message);
}
// check source != destination, see PLXUTILS-10
- if ( source.getCanonicalPath().equals( destination.getCanonicalPath() ) )
- {
+ if (source.getCanonicalPath().equals(destination.getCanonicalPath())) {
// if they are equal, we can exit the method without doing any work
return;
}
- mkdirsFor( destination );
+ mkdirsFor(destination);
- NioFiles.createSymbolicLink( destination, source );
+ NioFiles.createSymbolicLink(destination, source);
}
/**
@@ -1104,12 +929,9 @@ public static void linkFile( final File source, final File destination )
* @throws IOException if source does not exist, destination cannot be written to, or an
* IO error occurs during copying.
*/
- public static boolean copyFileIfModified( final File source, final File destination )
- throws IOException
- {
- if ( isSourceNewerThanDestination( source, destination ) )
- {
- copyFile( source, destination );
+ public static boolean copyFileIfModified(final File source, final File destination) throws IOException {
+ if (isSourceNewerThanDestination(source, destination)) {
+ copyFile(source, destination);
return true;
}
@@ -1131,10 +953,8 @@ public static boolean copyFileIfModified( final File source, final File destinat
*
null if the ..'s went past the
* root. Eg:
- *
+ *
*
* /foo// --> /foo/
* /foo/./ --> /foo/
@@ -1202,45 +1014,37 @@ private static void mkdirsFor( File destination )
* @param path the path to normalize
* @return the normalized String, or null if too many ..'s.
*/
- public static String normalize( final String path )
- {
+ public static String normalize(final String path) {
String normalized = path;
// Resolve occurrences of "//" in the normalized path
- while ( true )
- {
- int index = normalized.indexOf( "//" );
- if ( index < 0 )
- {
+ while (true) {
+ int index = normalized.indexOf("//");
+ if (index < 0) {
break;
}
- normalized = normalized.substring( 0, index ) + normalized.substring( index + 1 );
+ normalized = normalized.substring(0, index) + normalized.substring(index + 1);
}
// Resolve occurrences of "/./" in the normalized path
- while ( true )
- {
- int index = normalized.indexOf( "/./" );
- if ( index < 0 )
- {
+ while (true) {
+ int index = normalized.indexOf("/./");
+ if (index < 0) {
break;
}
- normalized = normalized.substring( 0, index ) + normalized.substring( index + 2 );
+ normalized = normalized.substring(0, index) + normalized.substring(index + 2);
}
// Resolve occurrences of "/../" in the normalized path
- while ( true )
- {
- int index = normalized.indexOf( "/../" );
- if ( index < 0 )
- {
+ while (true) {
+ int index = normalized.indexOf("/../");
+ if (index < 0) {
break;
}
- if ( index == 0 )
- {
+ if (index == 0) {
return null; // Trying to go outside our context
}
- int index2 = normalized.lastIndexOf( '/', index - 1 );
- normalized = normalized.substring( 0, index2 ) + normalized.substring( index + 3 );
+ int index2 = normalized.lastIndexOf('/', index - 1);
+ normalized = normalized.substring(0, index2) + normalized.substring(index + 3);
}
// Return the normalized path that we have completed
@@ -1249,45 +1053,40 @@ public static String normalize( final String path )
/**
* Will concatenate 2 paths. Paths with .. will be properly handled.
- *
+ *
* Eg.,
*
* /a/b/c + d = /a/b/d
* /a/b/c + ../d = /a/d
*
-
+ *
* Thieved from Tomcat sources...
*
* @param lookupPath a path
* @param path the path to concatenate
* @return The concatenated paths, or null if error occurs
*/
- public static String catPath( final String lookupPath, final String path )
- {
+ public static String catPath(final String lookupPath, final String path) {
// Cut off the last slash and everything beyond
- int index = lookupPath.lastIndexOf( "/" );
- String lookup = lookupPath.substring( 0, index );
+ int index = lookupPath.lastIndexOf("/");
+ String lookup = lookupPath.substring(0, index);
String pth = path;
// Deal with .. by chopping dirs off the lookup path
- while ( pth.startsWith( "../" ) )
- {
- if ( lookup.length() > 0 )
- {
- index = lookup.lastIndexOf( "/" );
- lookup = lookup.substring( 0, index );
- }
- else
- {
+ while (pth.startsWith("../")) {
+ if (lookup.length() > 0) {
+ index = lookup.lastIndexOf("/");
+ lookup = lookup.substring(0, index);
+ } else {
// More ..'s than dirs, return null
return null;
}
- index = pth.indexOf( "../" ) + 3;
- pth = pth.substring( index );
+ index = pth.indexOf("../") + 3;
+ pth = pth.substring(index);
}
- return new StringBuffer( lookup ).append( "/" ).append( pth ).toString();
+ return new StringBuffer(lookup).append("/").append(pth).toString();
}
/**
@@ -1299,30 +1098,23 @@ public static String catPath( final String lookupPath, final String path )
* @param filename Absolute or relative file path to resolve.
* @return The canonical File of filename.
*/
- public static File resolveFile( final File baseFile, String filename )
- {
+ public static File resolveFile(final File baseFile, String filename) {
String filenm = filename;
- if ( '/' != File.separatorChar )
- {
- filenm = filename.replace( '/', File.separatorChar );
+ if ('/' != File.separatorChar) {
+ filenm = filename.replace('/', File.separatorChar);
}
- if ( '\\' != File.separatorChar )
- {
- filenm = filename.replace( '\\', File.separatorChar );
+ if ('\\' != File.separatorChar) {
+ filenm = filename.replace('\\', File.separatorChar);
}
// deal with absolute files
- if ( filenm.startsWith( File.separator ) || ( Os.isFamily( Os.FAMILY_WINDOWS ) && filenm.indexOf( ":" ) > 0 ) )
- {
- File file = new File( filenm );
+ if (filenm.startsWith(File.separator) || (Os.isFamily(Os.FAMILY_WINDOWS) && filenm.indexOf(":") > 0)) {
+ File file = new File(filenm);
- try
- {
+ try {
file = file.getCanonicalFile();
- }
- catch ( final IOException ioe )
- {
+ } catch (final IOException ioe) {
// nop
}
@@ -1337,33 +1129,27 @@ public static File resolveFile( final File baseFile, String filename )
// on win32 at start of filename as UNC filenames can
// be \\AComputer\AShare\myfile.txt
int start = 0;
- if ( '\\' == File.separatorChar )
- {
- sb.append( filenm.charAt( 0 ) );
+ if ('\\' == File.separatorChar) {
+ sb.append(filenm.charAt(0));
start++;
}
- for ( int i = start; i < chars.length; i++ )
- {
+ for (int i = start; i < chars.length; i++) {
final boolean doubleSeparator = File.separatorChar == chars[i] && File.separatorChar == chars[i - 1];
- if ( !doubleSeparator )
- {
- sb.append( chars[i] );
+ if (!doubleSeparator) {
+ sb.append(chars[i]);
}
}
filenm = sb.toString();
// must be relative
- File file = ( new File( baseFile, filenm ) ).getAbsoluteFile();
+ File file = (new File(baseFile, filenm)).getAbsoluteFile();
- try
- {
+ try {
file = file.getCanonicalFile();
- }
- catch ( final IOException ioe )
- {
+ } catch (final IOException ioe) {
// nop
}
@@ -1376,10 +1162,8 @@ public static File resolveFile( final File baseFile, String filename )
* @param file the file path
* @throws IOException if any
*/
- public static void forceDelete( final String file )
- throws IOException
- {
- forceDelete( new File( file ) );
+ public static void forceDelete(final String file) throws IOException {
+ forceDelete(new File(file));
}
/**
@@ -1388,24 +1172,18 @@ public static void forceDelete( final String file )
* @param file a file
* @throws IOException if any
*/
- public static void forceDelete( final File file )
- throws IOException
- {
- if ( file.isDirectory() )
- {
- deleteDirectory( file );
- }
- else
- {
+ public static void forceDelete(final File file) throws IOException {
+ if (file.isDirectory()) {
+ deleteDirectory(file);
+ } else {
/*
* NOTE: Always try to delete the file even if it appears to be non-existent. This will ensure that a
* symlink whose target does not exist is deleted, too.
*/
boolean filePresent = file.getCanonicalFile().exists();
- if ( !deleteFile( file ) && filePresent )
- {
+ if (!deleteFile(file) && filePresent) {
final String message = "File " + file + " unable to be deleted.";
- throw new IOException( message );
+ throw new IOException(message);
}
}
}
@@ -1417,29 +1195,21 @@ public static void forceDelete( final File file )
* @param file a file
* @throws IOException if any
*/
- private static boolean deleteFile( File file )
- throws IOException
- {
- if ( file.isDirectory() )
- {
- throw new IOException( "File " + file + " isn't a file." );
+ private static boolean deleteFile(File file) throws IOException {
+ if (file.isDirectory()) {
+ throw new IOException("File " + file + " isn't a file.");
}
- if ( !file.delete() )
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
+ if (!file.delete()) {
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
file = file.getCanonicalFile();
System.gc();
}
- try
- {
- Thread.sleep( 10 );
+ try {
+ Thread.sleep(10);
return file.delete();
- }
- catch ( InterruptedException ignore )
- {
+ } catch (InterruptedException ignore) {
return file.delete();
}
}
@@ -1453,20 +1223,14 @@ private static boolean deleteFile( File file )
* @param file a file
* @throws IOException if any
*/
- public static void forceDeleteOnExit( final File file )
- throws IOException
- {
- if ( !file.exists() )
- {
+ public static void forceDeleteOnExit(final File file) throws IOException {
+ if (!file.exists()) {
return;
}
- if ( file.isDirectory() )
- {
- deleteDirectoryOnExit( file );
- }
- else
- {
+ if (file.isDirectory()) {
+ deleteDirectoryOnExit(file);
+ } else {
file.deleteOnExit();
}
}
@@ -1477,16 +1241,13 @@ public static void forceDeleteOnExit( final File file )
* @param directory a directory
* @throws IOException if any
*/
- private static void deleteDirectoryOnExit( final File directory )
- throws IOException
- {
- if ( !directory.exists() )
- {
+ private static void deleteDirectoryOnExit(final File directory) throws IOException {
+ if (!directory.exists()) {
return;
}
directory.deleteOnExit(); // The hook reverses the list
- cleanDirectoryOnExit( directory );
+ cleanDirectoryOnExit(directory);
}
/**
@@ -1495,38 +1256,29 @@ private static void deleteDirectoryOnExit( final File directory )
* @param directory a directory
* @throws IOException if any
*/
- private static void cleanDirectoryOnExit( final File directory )
- throws IOException
- {
- if ( !directory.exists() )
- {
+ private static void cleanDirectoryOnExit(final File directory) throws IOException {
+ if (!directory.exists()) {
final String message = directory + " does not exist";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
- if ( !directory.isDirectory() )
- {
+ if (!directory.isDirectory()) {
final String message = directory + " is not a directory";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
IOException exception = null;
final File[] files = directory.listFiles();
- for ( final File file : files )
- {
- try
- {
- forceDeleteOnExit( file );
- }
- catch ( final IOException ioe )
- {
+ for (final File file : files) {
+ try {
+ forceDeleteOnExit(file);
+ } catch (final IOException ioe) {
exception = ioe;
}
}
- if ( null != exception )
- {
+ if (null != exception) {
throw exception;
}
}
@@ -1539,34 +1291,25 @@ private static void cleanDirectoryOnExit( final File directory )
* @throws IllegalArgumentException if the file contains illegal Windows characters under Windows OS.
* @see #INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME
*/
- public static void forceMkdir( final File file )
- throws IOException
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- if ( !isValidWindowsFileName( file ) )
- {
- throw new IllegalArgumentException( "The file (" + file.getAbsolutePath()
- + ") cannot contain any of the following characters: \n"
- + StringUtils.join( INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " " ) );
+ public static void forceMkdir(final File file) throws IOException {
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+ if (!isValidWindowsFileName(file)) {
+ throw new IllegalArgumentException("The file (" + file.getAbsolutePath()
+ + ") cannot contain any of the following characters: \n"
+ + StringUtils.join(INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME, " "));
}
}
- if ( file.exists() )
- {
- if ( file.isFile() )
- {
+ if (file.exists()) {
+ if (file.isFile()) {
final String message =
- "File " + file + " exists and is " + "not a directory. Unable to create directory.";
- throw new IOException( message );
+ "File " + file + " exists and is " + "not a directory. Unable to create directory.";
+ throw new IOException(message);
}
- }
- else
- {
- if ( false == file.mkdirs() )
- {
+ } else {
+ if (false == file.mkdirs()) {
final String message = "Unable to create directory " + file;
- throw new IOException( message );
+ throw new IOException(message);
}
}
}
@@ -1577,10 +1320,8 @@ public static void forceMkdir( final File file )
* @param directory a directory
* @throws IOException if any
*/
- public static void deleteDirectory( final String directory )
- throws IOException
- {
- deleteDirectory( new File( directory ) );
+ public static void deleteDirectory(final String directory) throws IOException {
+ deleteDirectory(new File(directory));
}
/**
@@ -1589,11 +1330,8 @@ public static void deleteDirectory( final String directory )
* @param directory a directory
* @throws IOException if any
*/
- public static void deleteDirectory( final File directory )
- throws IOException
- {
- if ( !directory.exists() )
- {
+ public static void deleteDirectory(final File directory) throws IOException {
+ if (!directory.exists()) {
return;
}
@@ -1601,16 +1339,14 @@ public static void deleteDirectory( final File directory )
* try delete the directory before its contents, which will take care of any directories that are really
* symbolic links.
*/
- if ( directory.delete() )
- {
+ if (directory.delete()) {
return;
}
- cleanDirectory( directory );
- if ( !directory.delete() )
- {
+ cleanDirectory(directory);
+ if (!directory.delete()) {
final String message = "Directory " + directory + " unable to be deleted.";
- throw new IOException( message );
+ throw new IOException(message);
}
}
@@ -1620,10 +1356,8 @@ public static void deleteDirectory( final File directory )
* @param directory a directory
* @throws IOException if any
*/
- public static void cleanDirectory( final String directory )
- throws IOException
- {
- cleanDirectory( new File( directory ) );
+ public static void cleanDirectory(final String directory) throws IOException {
+ cleanDirectory(new File(directory));
}
/**
@@ -1632,44 +1366,34 @@ public static void cleanDirectory( final String directory )
* @param directory a directory
* @throws IOException if any
*/
- public static void cleanDirectory( final File directory )
- throws IOException
- {
- if ( !directory.exists() )
- {
+ public static void cleanDirectory(final File directory) throws IOException {
+ if (!directory.exists()) {
final String message = directory + " does not exist";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
- if ( !directory.isDirectory() )
- {
+ if (!directory.isDirectory()) {
final String message = directory + " is not a directory";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
IOException exception = null;
final File[] files = directory.listFiles();
- if ( files == null )
- {
+ if (files == null) {
return;
}
- for ( final File file : files )
- {
- try
- {
- forceDelete( file );
- }
- catch ( final IOException ioe )
- {
+ for (final File file : files) {
+ try {
+ forceDelete(file);
+ } catch (final IOException ioe) {
exception = ioe;
}
}
- if ( null != exception )
- {
+ if (null != exception) {
throw exception;
}
}
@@ -1680,9 +1404,8 @@ public static void cleanDirectory( final File directory )
* @param directory a directory
* @return size of directory in bytes.
*/
- public static long sizeOfDirectory( final String directory )
- {
- return sizeOfDirectory( new File( directory ) );
+ public static long sizeOfDirectory(final String directory) {
+ return sizeOfDirectory(new File(directory));
}
/**
@@ -1691,31 +1414,24 @@ public static long sizeOfDirectory( final String directory )
* @param directory a directory
* @return size of directory in bytes.
*/
- public static long sizeOfDirectory( final File directory )
- {
- if ( !directory.exists() )
- {
+ public static long sizeOfDirectory(final File directory) {
+ if (!directory.exists()) {
final String message = directory + " does not exist";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
- if ( !directory.isDirectory() )
- {
+ if (!directory.isDirectory()) {
final String message = directory + " is not a directory";
- throw new IllegalArgumentException( message );
+ throw new IllegalArgumentException(message);
}
long size = 0;
final File[] files = directory.listFiles();
- for ( final File file : files )
- {
- if ( file.isDirectory() )
- {
- size += sizeOfDirectory( file );
- }
- else
- {
+ for (final File file : files) {
+ if (file.isDirectory()) {
+ size += sizeOfDirectory(file);
+ } else {
size += file.length();
}
}
@@ -1734,10 +1450,8 @@ public static long sizeOfDirectory( final File directory )
* @throws IOException io issue
* @see #getFileNames(File, String, String, boolean)
*/
- public static List getFiles( File directory, String includes, String excludes )
- throws IOException
- {
- return getFiles( directory, includes, excludes, true );
+ public static List getFiles(File directory, String includes, String excludes) throws IOException {
+ return getFiles(directory, includes, excludes, true);
}
/**
@@ -1751,16 +1465,14 @@ public static List getFiles( File directory, String includes, String exclu
* @throws IOException io issue
* @see #getFileNames(File, String, String, boolean)
*/
- public static List getFiles( File directory, String includes, String excludes, boolean includeBasedir )
- throws IOException
- {
- List fileNames = getFileNames( directory, includes, excludes, includeBasedir );
+ public static List getFiles(File directory, String includes, String excludes, boolean includeBasedir)
+ throws IOException {
+ List fileNames = getFileNames(directory, includes, excludes, includeBasedir);
List files = new ArrayList();
- for ( String filename : fileNames )
- {
- files.add( new File( filename ) );
+ for (String filename : fileNames) {
+ files.add(new File(filename));
}
return files;
@@ -1776,10 +1488,9 @@ public static List getFiles( File directory, String includes, String exclu
* @return a list of files as String
* @throws IOException io issue
*/
- public static List getFileNames( File directory, String includes, String excludes, boolean includeBasedir )
- throws IOException
- {
- return getFileNames( directory, includes, excludes, includeBasedir, true );
+ public static List getFileNames(File directory, String includes, String excludes, boolean includeBasedir)
+ throws IOException {
+ return getFileNames(directory, includes, excludes, includeBasedir, true);
}
/**
@@ -1793,11 +1504,10 @@ public static List getFileNames( File directory, String includes, String
* @return a list of files as String
* @throws IOException io issue
*/
- public static List getFileNames( File directory, String includes, String excludes, boolean includeBasedir,
- boolean isCaseSensitive )
- throws IOException
- {
- return getFileAndDirectoryNames( directory, includes, excludes, includeBasedir, isCaseSensitive, true, false );
+ public static List getFileNames(
+ File directory, String includes, String excludes, boolean includeBasedir, boolean isCaseSensitive)
+ throws IOException {
+ return getFileAndDirectoryNames(directory, includes, excludes, includeBasedir, isCaseSensitive, true, false);
}
/**
@@ -1810,11 +1520,9 @@ public static List getFileNames( File directory, String includes, String
* @return a list of directories as String
* @throws IOException io issue
*/
- public static List getDirectoryNames( File directory, String includes, String excludes,
- boolean includeBasedir )
- throws IOException
- {
- return getDirectoryNames( directory, includes, excludes, includeBasedir, true );
+ public static List getDirectoryNames(
+ File directory, String includes, String excludes, boolean includeBasedir) throws IOException {
+ return getDirectoryNames(directory, includes, excludes, includeBasedir, true);
}
/**
@@ -1828,11 +1536,10 @@ public static List getDirectoryNames( File directory, String includes, S
* @return a list of directories as String
* @throws IOException io issue
*/
- public static List getDirectoryNames( File directory, String includes, String excludes,
- boolean includeBasedir, boolean isCaseSensitive )
- throws IOException
- {
- return getFileAndDirectoryNames( directory, includes, excludes, includeBasedir, isCaseSensitive, false, true );
+ public static List getDirectoryNames(
+ File directory, String includes, String excludes, boolean includeBasedir, boolean isCaseSensitive)
+ throws IOException {
+ return getFileAndDirectoryNames(directory, includes, excludes, includeBasedir, isCaseSensitive, false, true);
}
/**
@@ -1848,61 +1555,53 @@ public static List getDirectoryNames( File directory, String includes, S
* @return a list of files as String
* @throws IOException io issue
*/
- public static List getFileAndDirectoryNames( File directory, String includes, String excludes,
- boolean includeBasedir, boolean isCaseSensitive,
- boolean getFiles, boolean getDirectories )
- throws IOException
- {
+ public static List getFileAndDirectoryNames(
+ File directory,
+ String includes,
+ String excludes,
+ boolean includeBasedir,
+ boolean isCaseSensitive,
+ boolean getFiles,
+ boolean getDirectories)
+ throws IOException {
DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( directory );
+ scanner.setBasedir(directory);
- if ( includes != null )
- {
- scanner.setIncludes( StringUtils.split( includes, "," ) );
+ if (includes != null) {
+ scanner.setIncludes(StringUtils.split(includes, ","));
}
- if ( excludes != null )
- {
- scanner.setExcludes( StringUtils.split( excludes, "," ) );
+ if (excludes != null) {
+ scanner.setExcludes(StringUtils.split(excludes, ","));
}
- scanner.setCaseSensitive( isCaseSensitive );
+ scanner.setCaseSensitive(isCaseSensitive);
scanner.scan();
List list = new ArrayList();
- if ( getFiles )
- {
+ if (getFiles) {
String[] files = scanner.getIncludedFiles();
- for ( String file : files )
- {
- if ( includeBasedir )
- {
- list.add( directory + FileUtils.FS + file );
- }
- else
- {
- list.add( file );
+ for (String file : files) {
+ if (includeBasedir) {
+ list.add(directory + FileUtils.FS + file);
+ } else {
+ list.add(file);
}
}
}
- if ( getDirectories )
- {
+ if (getDirectories) {
String[] directories = scanner.getIncludedDirectories();
- for ( String directory1 : directories )
- {
- if ( includeBasedir )
- {
- list.add( directory + FileUtils.FS + directory1 );
- }
- else
- {
- list.add( directory1 );
+ for (String directory1 : directories) {
+ if (includeBasedir) {
+ list.add(directory + FileUtils.FS + directory1);
+ } else {
+ list.add(directory1);
}
}
}
@@ -1917,10 +1616,8 @@ public static List getFileAndDirectoryNames( File directory, String incl
* @param destinationDirectory the target dir
* @throws IOException if any
*/
- public static void copyDirectory( File sourceDirectory, File destinationDirectory )
- throws IOException
- {
- copyDirectory( sourceDirectory, destinationDirectory, "**", null );
+ public static void copyDirectory(File sourceDirectory, File destinationDirectory) throws IOException {
+ copyDirectory(sourceDirectory, destinationDirectory, "**", null);
}
/**
@@ -1933,26 +1630,22 @@ public static void copyDirectory( File sourceDirectory, File destinationDirector
* @throws IOException if any
* @see #getFiles(File, String, String)
*/
- public static void copyDirectory( File sourceDirectory, File destinationDirectory, String includes,
- String excludes )
- throws IOException
- {
- if ( !sourceDirectory.exists() )
- {
+ public static void copyDirectory(File sourceDirectory, File destinationDirectory, String includes, String excludes)
+ throws IOException {
+ if (!sourceDirectory.exists()) {
return;
}
- List files = getFiles( sourceDirectory, includes, excludes );
+ List files = getFiles(sourceDirectory, includes, excludes);
- for ( File file : files )
- {
- copyFileToDirectory( file, destinationDirectory );
+ for (File file : files) {
+ copyFileToDirectory(file, destinationDirectory);
}
}
/**
* Copies a entire directory layout : no files will be copied only directories
- *
+ *
* Note:
*
* - It will include empty directories.
@@ -1966,69 +1659,57 @@ public static void copyDirectory( File sourceDirectory, File destinationDirector
* @throws IOException if any
* @since 1.5.7
*/
- public static void copyDirectoryLayout( File sourceDirectory, File destinationDirectory, String[] includes,
- String[] excludes )
- throws IOException
- {
- if ( sourceDirectory == null )
- {
- throw new IOException( "source directory can't be null." );
+ public static void copyDirectoryLayout(
+ File sourceDirectory, File destinationDirectory, String[] includes, String[] excludes) throws IOException {
+ if (sourceDirectory == null) {
+ throw new IOException("source directory can't be null.");
}
- if ( destinationDirectory == null )
- {
- throw new IOException( "destination directory can't be null." );
+ if (destinationDirectory == null) {
+ throw new IOException("destination directory can't be null.");
}
- if ( sourceDirectory.equals( destinationDirectory ) )
- {
- throw new IOException( "source and destination are the same directory." );
+ if (sourceDirectory.equals(destinationDirectory)) {
+ throw new IOException("source and destination are the same directory.");
}
- if ( !sourceDirectory.exists() )
- {
- throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
+ if (!sourceDirectory.exists()) {
+ throw new IOException("Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ").");
}
DirectoryScanner scanner = new DirectoryScanner();
- scanner.setBasedir( sourceDirectory );
+ scanner.setBasedir(sourceDirectory);
- if ( includes != null && includes.length >= 1 )
- {
- scanner.setIncludes( includes );
- }
- else
- {
- scanner.setIncludes( new String[] { "**" } );
+ if (includes != null && includes.length >= 1) {
+ scanner.setIncludes(includes);
+ } else {
+ scanner.setIncludes(new String[] {"**"});
}
- if ( excludes != null && excludes.length >= 1 )
- {
- scanner.setExcludes( excludes );
+ if (excludes != null && excludes.length >= 1) {
+ scanner.setExcludes(excludes);
}
scanner.addDefaultExcludes();
scanner.scan();
- List
includedDirectories = Arrays.asList( scanner.getIncludedDirectories() );
+ List includedDirectories = Arrays.asList(scanner.getIncludedDirectories());
- for ( String name : includedDirectories )
- {
- File source = new File( sourceDirectory, name );
+ for (String name : includedDirectories) {
+ File source = new File(sourceDirectory, name);
- if ( source.equals( sourceDirectory ) )
- {
+ if (source.equals(sourceDirectory)) {
continue;
}
- File destination = new File( destinationDirectory, name );
+ File destination = new File(destinationDirectory, name);
destination.mkdirs();
}
}
/**
* Copies a entire directory structure.
- *
+ *
* Note:
*
* - It will include empty directories.
@@ -2039,15 +1720,13 @@ public static void copyDirectoryLayout( File sourceDirectory, File destinationDi
* @param destinationDirectory the target dir
* @throws IOException if any
*/
- public static void copyDirectoryStructure( File sourceDirectory, File destinationDirectory )
- throws IOException
- {
- copyDirectoryStructure( sourceDirectory, destinationDirectory, destinationDirectory, false );
+ public static void copyDirectoryStructure(File sourceDirectory, File destinationDirectory) throws IOException {
+ copyDirectoryStructure(sourceDirectory, destinationDirectory, destinationDirectory, false);
}
/**
*
Copies an entire directory structure but only source files with timestamp later than the destinations'.
- *
+ *
* Note:
*
* - It will include empty directories.
@@ -2058,87 +1737,70 @@ public static void copyDirectoryStructure( File sourceDirectory, File destinatio
* @param destinationDirectory the target dir
* @throws IOException if any
*/
- public static void copyDirectoryStructureIfModified( File sourceDirectory, File destinationDirectory )
- throws IOException
- {
- copyDirectoryStructure( sourceDirectory, destinationDirectory, destinationDirectory, true );
+ public static void copyDirectoryStructureIfModified(File sourceDirectory, File destinationDirectory)
+ throws IOException {
+ copyDirectoryStructure(sourceDirectory, destinationDirectory, destinationDirectory, true);
}
- private static void copyDirectoryStructure( File sourceDirectory, File destinationDirectory,
- File rootDestinationDirectory, boolean onlyModifiedFiles )
- throws IOException
- {
- if ( sourceDirectory == null )
- {
- throw new IOException( "source directory can't be null." );
+ private static void copyDirectoryStructure(
+ File sourceDirectory, File destinationDirectory, File rootDestinationDirectory, boolean onlyModifiedFiles)
+ throws IOException {
+ if (sourceDirectory == null) {
+ throw new IOException("source directory can't be null.");
}
- if ( destinationDirectory == null )
- {
- throw new IOException( "destination directory can't be null." );
+ if (destinationDirectory == null) {
+ throw new IOException("destination directory can't be null.");
}
- if ( sourceDirectory.equals( destinationDirectory ) )
- {
- throw new IOException( "source and destination are the same directory." );
+ if (sourceDirectory.equals(destinationDirectory)) {
+ throw new IOException("source and destination are the same directory.");
}
- if ( !sourceDirectory.exists() )
- {
- throw new IOException( "Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ")." );
+ if (!sourceDirectory.exists()) {
+ throw new IOException("Source directory doesn't exists (" + sourceDirectory.getAbsolutePath() + ").");
}
File[] files = sourceDirectory.listFiles();
String sourcePath = sourceDirectory.getAbsolutePath();
- for ( File file : files )
- {
- if ( file.equals( rootDestinationDirectory ) )
- {
+ for (File file : files) {
+ if (file.equals(rootDestinationDirectory)) {
// We don't copy the destination directory in itself
continue;
}
String dest = file.getAbsolutePath();
- dest = dest.substring( sourcePath.length() + 1 );
+ dest = dest.substring(sourcePath.length() + 1);
- File destination = new File( destinationDirectory, dest );
+ File destination = new File(destinationDirectory, dest);
- if ( file.isFile() )
- {
+ if (file.isFile()) {
destination = destination.getParentFile();
- if ( onlyModifiedFiles )
- {
- copyFileToDirectoryIfModified( file, destination );
+ if (onlyModifiedFiles) {
+ copyFileToDirectoryIfModified(file, destination);
+ } else {
+ copyFileToDirectory(file, destination);
}
- else
- {
- copyFileToDirectory( file, destination );
- }
- }
- else if ( file.isDirectory() )
- {
- if ( !destination.exists() && !destination.mkdirs() )
- {
- throw new IOException( "Could not create destination directory '" + destination.getAbsolutePath()
- + "'." );
+ } else if (file.isDirectory()) {
+ if (!destination.exists() && !destination.mkdirs()) {
+ throw new IOException(
+ "Could not create destination directory '" + destination.getAbsolutePath() + "'.");
}
- copyDirectoryStructure( file, destination, rootDestinationDirectory, onlyModifiedFiles );
- }
- else
- {
- throw new IOException( "Unknown file type: " + file.getAbsolutePath() );
+ copyDirectoryStructure(file, destination, rootDestinationDirectory, onlyModifiedFiles);
+ } else {
+ throw new IOException("Unknown file type: " + file.getAbsolutePath());
}
}
}
/**
*
Renames a file, even if that involves crossing file system boundaries.
- *
+ *
* This will remove to (if it exists), ensure that to's parent directory exists and move
* from, which involves deleting from as well.
*
@@ -2147,41 +1809,35 @@ else if ( file.isDirectory() )
* @throws IOException if anything bad happens during this process. Note that to may have been deleted
* already when this happens.
*/
- public static void rename( File from, File to )
- throws IOException
- {
- if ( to.exists() && !to.delete() )
- {
- throw new IOException( "Failed to delete " + to + " while trying to rename " + from );
+ public static void rename(File from, File to) throws IOException {
+ if (to.exists() && !to.delete()) {
+ throw new IOException("Failed to delete " + to + " while trying to rename " + from);
}
File parent = to.getParentFile();
- if ( parent != null && !parent.exists() && !parent.mkdirs() )
- {
- throw new IOException( "Failed to create directory " + parent + " while trying to rename " + from );
+ if (parent != null && !parent.exists() && !parent.mkdirs()) {
+ throw new IOException("Failed to create directory " + parent + " while trying to rename " + from);
}
- if ( !from.renameTo( to ) )
- {
- copyFile( from, to );
- if ( !from.delete() )
- {
- throw new IOException( "Failed to delete " + from + " while trying to rename it." );
+ if (!from.renameTo(to)) {
+ copyFile(from, to);
+ if (!from.delete()) {
+ throw new IOException("Failed to delete " + from + " while trying to rename it.");
}
}
}
/**
* Create a temporary file in a given directory.
- *
+ *
* The file denoted by the returned abstract pathname did not exist before this method was invoked, any subsequent
* invocation of this method will yield a different file name.
- *
+ *
* The filename is prefixNNNNNsuffix where NNNN is a random number
- *
+ *
* This method is different to {@link File#createTempFile(String, String, File)} of JDK 1.2 as it doesn't create the
* file itself. It uses the location pointed to by java.io.tmpdir when the parentDir attribute is null.
- *
+ *
* To delete automatically the file created by this method, use the {@link File#deleteOnExit()} method.
*
* @param prefix prefix before the random number
@@ -2189,25 +1845,20 @@ public static void rename( File from, File to )
* @param parentDir Directory to create the temporary file in -java.io.tmpdir used if not specificed
* @return a File reference to the new temporary file.
*/
- public static File createTempFile( String prefix, String suffix, File parentDir )
- {
+ public static File createTempFile(String prefix, String suffix, File parentDir) {
File result = null;
- String parent = System.getProperty( "java.io.tmpdir" );
- if ( parentDir != null )
- {
+ String parent = System.getProperty("java.io.tmpdir");
+ if (parentDir != null) {
parent = parentDir.getPath();
}
- DecimalFormat fmt = new DecimalFormat( "#####" );
+ DecimalFormat fmt = new DecimalFormat("#####");
SecureRandom secureRandom = new SecureRandom();
long secureInitializer = secureRandom.nextLong();
- Random rand = new Random( secureInitializer + Runtime.getRuntime().freeMemory() );
- synchronized ( rand )
- {
- do
- {
- result = new File( parent, prefix + fmt.format( Math.abs( rand.nextInt() ) ) + suffix );
- }
- while ( result.exists() );
+ Random rand = new Random(secureInitializer + Runtime.getRuntime().freeMemory());
+ synchronized (rand) {
+ do {
+ result = new File(parent, prefix + fmt.format(Math.abs(rand.nextInt())) + suffix);
+ } while (result.exists());
}
return result;
@@ -2222,15 +1873,12 @@ public static File createTempFile( String prefix, String suffix, File parentDir
* @param wrappers array of {@link FilterWrapper}
* @throws IOException if an IO error occurs during copying or filtering
*/
- public static void copyFile( File from, File to, String encoding, FilterWrapper[] wrappers )
- throws IOException
- {
- copyFile( from, to, encoding, wrappers, false );
+ public static void copyFile(File from, File to, String encoding, FilterWrapper[] wrappers) throws IOException {
+ copyFile(from, to, encoding, wrappers, false);
}
- public static abstract class FilterWrapper
- {
- public abstract Reader getReader( Reader fileReader );
+ public abstract static class FilterWrapper {
+ public abstract Reader getReader(Reader fileReader);
}
/**
@@ -2244,59 +1892,48 @@ public static abstract class FilterWrapper
* @throws IOException if an IO error occurs during copying or filtering
* @since 1.5.2
*/
- public static void copyFile( File from, File to, String encoding, FilterWrapper[] wrappers, boolean overwrite )
- throws IOException
- {
- if ( wrappers != null && wrappers.length > 0 )
- {
+ public static void copyFile(File from, File to, String encoding, FilterWrapper[] wrappers, boolean overwrite)
+ throws IOException {
+ if (wrappers != null && wrappers.length > 0) {
// buffer so it isn't reading a byte at a time!
Reader fileReader = null;
Writer fileWriter = null;
- try
- {
- if ( encoding == null || encoding.length() < 1 )
- {
- fileReader = Files.newBufferedReader( from.toPath() );
- fileWriter = Files.newBufferedWriter( to.toPath() );
- }
- else
- {
- OutputStream outstream = Files.newOutputStream( to.toPath() );
+ try {
+ if (encoding == null || encoding.length() < 1) {
+ fileReader = Files.newBufferedReader(from.toPath());
+ fileWriter = Files.newBufferedWriter(to.toPath());
+ } else {
+ OutputStream outstream = Files.newOutputStream(to.toPath());
- fileReader = Files.newBufferedReader( from.toPath(), Charset.forName( encoding ) );
+ fileReader = Files.newBufferedReader(from.toPath(), Charset.forName(encoding));
- fileWriter = new OutputStreamWriter( outstream, encoding );
+ fileWriter = new OutputStreamWriter(outstream, encoding);
}
Reader reader = fileReader;
- for ( FilterWrapper wrapper : wrappers )
- {
- reader = wrapper.getReader( reader );
+ for (FilterWrapper wrapper : wrappers) {
+ reader = wrapper.getReader(reader);
}
- IOUtil.copy( reader, fileWriter );
+ IOUtil.copy(reader, fileWriter);
fileWriter.close();
fileWriter = null;
fileReader.close();
fileReader = null;
+ } finally {
+ IOUtil.close(fileReader);
+ IOUtil.close(fileWriter);
}
- finally
- {
- IOUtil.close( fileReader );
- IOUtil.close( fileWriter );
- }
- }
- else
- {
- if ( isSourceNewerThanDestination( from, to ) || overwrite )
- {
- copyFile( from, to );
+ } else {
+ if (isSourceNewerThanDestination(from, to) || overwrite) {
+ copyFile(from, to);
}
}
}
- private static boolean isSourceNewerThanDestination( File source, File destination ) {
- return ( destination.lastModified() == 0L && source.lastModified() == 0L ) || destination.lastModified() < source.lastModified();
+ private static boolean isSourceNewerThanDestination(File source, File destination) {
+ return (destination.lastModified() == 0L && source.lastModified() == 0L)
+ || destination.lastModified() < source.lastModified();
}
/**
@@ -2306,22 +1943,16 @@ private static boolean isSourceNewerThanDestination( File source, File destinati
* @return a List containing every every line not starting with # and not empty
* @throws IOException if any
*/
- public static List loadFile( File file )
- throws IOException
- {
+ public static List loadFile(File file) throws IOException {
final List lines = new ArrayList();
- if ( file.exists() )
- {
- try ( BufferedReader reader = Files.newBufferedReader( file.toPath() ) )
- {
- for ( String line = reader.readLine(); line != null; line = reader.readLine() )
- {
+ if (file.exists()) {
+ try (BufferedReader reader = Files.newBufferedReader(file.toPath())) {
+ for (String line = reader.readLine(); line != null; line = reader.readLine()) {
line = line.trim();
- if ( !line.startsWith( "#" ) && line.length() != 0 )
- {
- lines.add( line );
+ if (!line.startsWith("#") && line.length() != 0) {
+ lines.add(line);
}
}
}
@@ -2340,19 +1971,15 @@ public static List loadFile( File file )
* @see #INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME
* @since 1.5.2
*/
- public static boolean isValidWindowsFileName( File f )
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- if ( StringUtils.indexOfAny( f.getName(), INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME ) != -1 )
- {
+ public static boolean isValidWindowsFileName(File f) {
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+ if (StringUtils.indexOfAny(f.getName(), INVALID_CHARACTERS_FOR_WINDOWS_FILE_NAME) != -1) {
return false;
}
File parentFile = f.getParentFile();
- if ( parentFile != null )
- {
- return isValidWindowsFileName( parentFile );
+ if (parentFile != null) {
+ return isValidWindowsFileName(parentFile);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/IOUtil.java b/src/main/java/org/codehaus/plexus/util/IOUtil.java
index b431a8d9..e7f20908 100644
--- a/src/main/java/org/codehaus/plexus/util/IOUtil.java
+++ b/src/main/java/org/codehaus/plexus/util/IOUtil.java
@@ -132,16 +132,13 @@
* method variants to specify buffer size and encoding, each row may correspond to up to 4 methods.
*/
-public final class IOUtil extends BaseIOUtil
-{
+public final class IOUtil extends BaseIOUtil {
private static final int DEFAULT_BUFFER_SIZE = 1024 * 16;
/**
* Private constructor to prevent instantiation.
*/
- private IOUtil()
- {
- }
+ private IOUtil() {}
///////////////////////////////////////////////////////////////
// Core copy methods
@@ -153,10 +150,8 @@ private IOUtil()
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final OutputStream output )
- throws IOException
- {
- BaseIOUtil.copy( input, output );
+ public static void copy(final InputStream input, final OutputStream output) throws IOException {
+ BaseIOUtil.copy(input, output);
}
/**
@@ -166,14 +161,12 @@ public static void copy( final InputStream input, final OutputStream output )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final OutputStream output, final int bufferSize )
- throws IOException
- {
+ public static void copy(final InputStream input, final OutputStream output, final int bufferSize)
+ throws IOException {
final byte[] buffer = new byte[bufferSize];
int n = 0;
- while ( 0 <= ( n = input.read( buffer ) ) )
- {
- output.write( buffer, 0, n );
+ while (0 <= (n = input.read(buffer))) {
+ output.write(buffer, 0, n);
}
}
@@ -183,10 +176,8 @@ public static void copy( final InputStream input, final OutputStream output, fin
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final Reader input, final Writer output )
- throws IOException
- {
- BaseIOUtil.copy( input, output );
+ public static void copy(final Reader input, final Writer output) throws IOException {
+ BaseIOUtil.copy(input, output);
}
/**
@@ -196,14 +187,11 @@ public static void copy( final Reader input, final Writer output )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final Reader input, final Writer output, final int bufferSize )
- throws IOException
- {
+ public static void copy(final Reader input, final Writer output, final int bufferSize) throws IOException {
final char[] buffer = new char[bufferSize];
int n = 0;
- while ( 0 <= ( n = input.read( buffer ) ) )
- {
- output.write( buffer, 0, n );
+ while (0 <= (n = input.read(buffer))) {
+ output.write(buffer, 0, n);
}
output.flush();
}
@@ -223,10 +211,8 @@ public static void copy( final Reader input, final Writer output, final int buff
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final Writer output )
- throws IOException
- {
- copy( input, output, DEFAULT_BUFFER_SIZE );
+ public static void copy(final InputStream input, final Writer output) throws IOException {
+ copy(input, output, DEFAULT_BUFFER_SIZE);
}
/**
@@ -237,11 +223,9 @@ public static void copy( final InputStream input, final Writer output )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final Writer output, final int bufferSize )
- throws IOException
- {
- final InputStreamReader in = new InputStreamReader( input );
- copy( in, output, bufferSize );
+ public static void copy(final InputStream input, final Writer output, final int bufferSize) throws IOException {
+ final InputStreamReader in = new InputStreamReader(input);
+ copy(in, output, bufferSize);
}
/**
@@ -254,11 +238,9 @@ public static void copy( final InputStream input, final Writer output, final int
* encoding types.
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final Writer output, final String encoding )
- throws IOException
- {
- final InputStreamReader in = new InputStreamReader( input, encoding );
- copy( in, output );
+ public static void copy(final InputStream input, final Writer output, final String encoding) throws IOException {
+ final InputStreamReader in = new InputStreamReader(input, encoding);
+ copy(in, output);
}
/**
@@ -272,11 +254,10 @@ public static void copy( final InputStream input, final Writer output, final Str
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final InputStream input, final Writer output, final String encoding, final int bufferSize )
- throws IOException
- {
- final InputStreamReader in = new InputStreamReader( input, encoding );
- copy( in, output, bufferSize );
+ public static void copy(final InputStream input, final Writer output, final String encoding, final int bufferSize)
+ throws IOException {
+ final InputStreamReader in = new InputStreamReader(input, encoding);
+ copy(in, output, bufferSize);
}
///////////////////////////////////////////////////////////////
@@ -288,10 +269,8 @@ public static void copy( final InputStream input, final Writer output, final Str
* @param input to convert
* @throws IOException io issue
*/
- public static String toString( final InputStream input )
- throws IOException
- {
- return toString( input, DEFAULT_BUFFER_SIZE );
+ public static String toString(final InputStream input) throws IOException {
+ return toString(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -301,11 +280,9 @@ public static String toString( final InputStream input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static String toString( final InputStream input, final int bufferSize )
- throws IOException
- {
+ public static String toString(final InputStream input, final int bufferSize) throws IOException {
final StringWriter sw = new StringWriter();
- copy( input, sw, bufferSize );
+ copy(input, sw, bufferSize);
return sw.toString();
}
@@ -317,10 +294,8 @@ public static String toString( final InputStream input, final int bufferSize )
* encoding types.
* @throws IOException io issue
*/
- public static String toString( final InputStream input, final String encoding )
- throws IOException
- {
- return toString( input, encoding, DEFAULT_BUFFER_SIZE );
+ public static String toString(final InputStream input, final String encoding) throws IOException {
+ return toString(input, encoding, DEFAULT_BUFFER_SIZE);
}
/**
@@ -332,11 +307,10 @@ public static String toString( final InputStream input, final String encoding )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static String toString( final InputStream input, final String encoding, final int bufferSize )
- throws IOException
- {
+ public static String toString(final InputStream input, final String encoding, final int bufferSize)
+ throws IOException {
final StringWriter sw = new StringWriter();
- copy( input, sw, encoding, bufferSize );
+ copy(input, sw, encoding, bufferSize);
return sw.toString();
}
@@ -348,10 +322,8 @@ public static String toString( final InputStream input, final String encoding, f
* @param input to convert
* @throws IOException io issue
*/
- public static byte[] toByteArray( final InputStream input )
- throws IOException
- {
- return toByteArray( input, DEFAULT_BUFFER_SIZE );
+ public static byte[] toByteArray(final InputStream input) throws IOException {
+ return toByteArray(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -360,11 +332,9 @@ public static byte[] toByteArray( final InputStream input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static byte[] toByteArray( final InputStream input, final int bufferSize )
- throws IOException
- {
+ public static byte[] toByteArray(final InputStream input, final int bufferSize) throws IOException {
final ByteArrayOutputStream output = new ByteArrayOutputStream();
- copy( input, output, bufferSize );
+ copy(input, output, bufferSize);
return output.toByteArray();
}
@@ -382,10 +352,8 @@ public static byte[] toByteArray( final InputStream input, final int bufferSize
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final Reader input, final OutputStream output )
- throws IOException
- {
- copy( input, output, DEFAULT_BUFFER_SIZE );
+ public static void copy(final Reader input, final OutputStream output) throws IOException {
+ copy(input, output, DEFAULT_BUFFER_SIZE);
}
/**
@@ -396,11 +364,9 @@ public static void copy( final Reader input, final OutputStream output )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final Reader input, final OutputStream output, final int bufferSize )
- throws IOException
- {
- final OutputStreamWriter out = new OutputStreamWriter( output );
- copy( input, out, bufferSize );
+ public static void copy(final Reader input, final OutputStream output, final int bufferSize) throws IOException {
+ final OutputStreamWriter out = new OutputStreamWriter(output);
+ copy(input, out, bufferSize);
// NOTE: Unless anyone is planning on rewriting OutputStreamWriter, we have to flush
// here.
out.flush();
@@ -413,10 +379,8 @@ public static void copy( final Reader input, final OutputStream output, final in
* @param input to convert
* @throws IOException io issue
*/
- public static String toString( final Reader input )
- throws IOException
- {
- return toString( input, DEFAULT_BUFFER_SIZE );
+ public static String toString(final Reader input) throws IOException {
+ return toString(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -425,11 +389,9 @@ public static String toString( final Reader input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static String toString( final Reader input, final int bufferSize )
- throws IOException
- {
+ public static String toString(final Reader input, final int bufferSize) throws IOException {
final StringWriter sw = new StringWriter();
- copy( input, sw, bufferSize );
+ copy(input, sw, bufferSize);
return sw.toString();
}
@@ -440,10 +402,8 @@ public static String toString( final Reader input, final int bufferSize )
* @param input to convert
* @throws IOException io issue
*/
- public static byte[] toByteArray( final Reader input )
- throws IOException
- {
- return toByteArray( input, DEFAULT_BUFFER_SIZE );
+ public static byte[] toByteArray(final Reader input) throws IOException {
+ return toByteArray(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -452,11 +412,9 @@ public static byte[] toByteArray( final Reader input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static byte[] toByteArray( final Reader input, final int bufferSize )
- throws IOException
- {
+ public static byte[] toByteArray(final Reader input, final int bufferSize) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
- copy( input, output, bufferSize );
+ copy(input, output, bufferSize);
return output.toByteArray();
}
@@ -475,26 +433,22 @@ public static byte[] toByteArray( final Reader input, final int bufferSize )
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final String input, final OutputStream output )
- throws IOException
- {
- copy( input, output, DEFAULT_BUFFER_SIZE );
+ public static void copy(final String input, final OutputStream output) throws IOException {
+ copy(input, output, DEFAULT_BUFFER_SIZE);
}
/**
* Serialize chars from a String to bytes on an OutputStream, and flush the
* OutputStream.
* @param input to convert
- * @param output the result
+ * @param output the result
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final String input, final OutputStream output, final int bufferSize )
- throws IOException
- {
- final StringReader in = new StringReader( input );
- final OutputStreamWriter out = new OutputStreamWriter( output );
- copy( in, out, bufferSize );
+ public static void copy(final String input, final OutputStream output, final int bufferSize) throws IOException {
+ final StringReader in = new StringReader(input);
+ final OutputStreamWriter out = new OutputStreamWriter(output);
+ copy(in, out, bufferSize);
// NOTE: Unless anyone is planning on rewriting OutputStreamWriter, we have to flush
// here.
out.flush();
@@ -509,10 +463,8 @@ public static void copy( final String input, final OutputStream output, final in
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final String input, final Writer output )
- throws IOException
- {
- output.write( input );
+ public static void copy(final String input, final Writer output) throws IOException {
+ output.write(input);
}
/**
@@ -521,18 +473,16 @@ public static void copy( final String input, final Writer output )
* {@link #copy(InputStream, OutputStream)}, and flushing the output stream afterwards. The streams are not closed
* after the copy.
* @param input to convert
- * @param output the result
+ * @param output the result
* @deprecated Buffering streams is actively harmful! See the class description as to why. Use
* {@link #copy(InputStream, OutputStream)} instead.
* @throws IOException io issue
*/
@Deprecated
- public static void bufferedCopy( final InputStream input, final OutputStream output )
- throws IOException
- {
- final BufferedInputStream in = new BufferedInputStream( input );
- final BufferedOutputStream out = new BufferedOutputStream( output );
- copy( in, out );
+ public static void bufferedCopy(final InputStream input, final OutputStream output) throws IOException {
+ final BufferedInputStream in = new BufferedInputStream(input);
+ final BufferedOutputStream out = new BufferedOutputStream(output);
+ copy(in, out);
out.flush();
}
@@ -543,10 +493,8 @@ public static void bufferedCopy( final InputStream input, final OutputStream out
* @param input to convert
* @throws IOException io issue
*/
- public static byte[] toByteArray( final String input )
- throws IOException
- {
- return toByteArray( input, DEFAULT_BUFFER_SIZE );
+ public static byte[] toByteArray(final String input) throws IOException {
+ return toByteArray(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -555,11 +503,9 @@ public static byte[] toByteArray( final String input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static byte[] toByteArray( final String input, final int bufferSize )
- throws IOException
- {
+ public static byte[] toByteArray(final String input, final int bufferSize) throws IOException {
ByteArrayOutputStream output = new ByteArrayOutputStream();
- copy( input, output, bufferSize );
+ copy(input, output, bufferSize);
return output.toByteArray();
}
@@ -578,60 +524,53 @@ public static byte[] toByteArray( final String input, final int bufferSize )
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final Writer output )
- throws IOException
- {
- copy( input, output, DEFAULT_BUFFER_SIZE );
+ public static void copy(final byte[] input, final Writer output) throws IOException {
+ copy(input, output, DEFAULT_BUFFER_SIZE);
}
/**
* Copy and convert bytes from a byte[] to chars on a Writer. The platform's default
* encoding is used for the byte-to-char conversion.
* @param input to convert
- * @param output the result
+ * @param output the result
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final Writer output, final int bufferSize )
- throws IOException
- {
- final ByteArrayInputStream in = new ByteArrayInputStream( input );
- copy( in, output, bufferSize );
+ public static void copy(final byte[] input, final Writer output, final int bufferSize) throws IOException {
+ final ByteArrayInputStream in = new ByteArrayInputStream(input);
+ copy(in, output, bufferSize);
}
/**
* Copy and convert bytes from a byte[] to chars on a Writer, using the specified
* encoding.
* @param input to convert
- * @param output the result
+ * @param output the result
* @param encoding The name of a supported character encoding. See the
* IANA Charset Registry for a list of valid
* encoding types.
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final Writer output, final String encoding )
- throws IOException
- {
- final ByteArrayInputStream in = new ByteArrayInputStream( input );
- copy( in, output, encoding );
+ public static void copy(final byte[] input, final Writer output, final String encoding) throws IOException {
+ final ByteArrayInputStream in = new ByteArrayInputStream(input);
+ copy(in, output, encoding);
}
/**
* Copy and convert bytes from a byte[] to chars on a Writer, using the specified
* encoding.
* @param input to convert
- * @param output the result
+ * @param output the result
* @param encoding The name of a supported character encoding. See the
* IANA Charset Registry for a list of valid
* encoding types.
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final Writer output, final String encoding, final int bufferSize )
- throws IOException
- {
- final ByteArrayInputStream in = new ByteArrayInputStream( input );
- copy( in, output, encoding, bufferSize );
+ public static void copy(final byte[] input, final Writer output, final String encoding, final int bufferSize)
+ throws IOException {
+ final ByteArrayInputStream in = new ByteArrayInputStream(input);
+ copy(in, output, encoding, bufferSize);
}
///////////////////////////////////////////////////////////////
@@ -643,10 +582,8 @@ public static void copy( final byte[] input, final Writer output, final String e
* @param input to convert
* @throws IOException io issue
*/
- public static String toString( final byte[] input )
- throws IOException
- {
- return toString( input, DEFAULT_BUFFER_SIZE );
+ public static String toString(final byte[] input) throws IOException {
+ return toString(input, DEFAULT_BUFFER_SIZE);
}
/**
@@ -656,11 +593,9 @@ public static String toString( final byte[] input )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static String toString( final byte[] input, final int bufferSize )
- throws IOException
- {
+ public static String toString(final byte[] input, final int bufferSize) throws IOException {
final StringWriter sw = new StringWriter();
- copy( input, sw, bufferSize );
+ copy(input, sw, bufferSize);
return sw.toString();
}
@@ -672,10 +607,8 @@ public static String toString( final byte[] input, final int bufferSize )
* encoding types.
* @throws IOException io issue
*/
- public static String toString( final byte[] input, final String encoding )
- throws IOException
- {
- return toString( input, encoding, DEFAULT_BUFFER_SIZE );
+ public static String toString(final byte[] input, final String encoding) throws IOException {
+ return toString(input, encoding, DEFAULT_BUFFER_SIZE);
}
/**
@@ -688,11 +621,9 @@ public static String toString( final byte[] input, final String encoding )
*
* @throws IOException io issue
*/
- public static String toString( final byte[] input, final String encoding, final int bufferSize )
- throws IOException
- {
+ public static String toString(final byte[] input, final String encoding, final int bufferSize) throws IOException {
final StringWriter sw = new StringWriter();
- copy( input, sw, encoding, bufferSize );
+ copy(input, sw, encoding, bufferSize);
return sw.toString();
}
@@ -705,10 +636,8 @@ public static String toString( final byte[] input, final String encoding, final
* @param output the result
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final OutputStream output )
- throws IOException
- {
- copy( input, output, DEFAULT_BUFFER_SIZE );
+ public static void copy(final byte[] input, final OutputStream output) throws IOException {
+ copy(input, output, DEFAULT_BUFFER_SIZE);
}
/**
@@ -718,10 +647,8 @@ public static void copy( final byte[] input, final OutputStream output )
* @param bufferSize Size of internal buffer to use.
* @throws IOException io issue
*/
- public static void copy( final byte[] input, final OutputStream output, final int bufferSize )
- throws IOException
- {
- output.write( input );
+ public static void copy(final byte[] input, final OutputStream output, final int bufferSize) throws IOException {
+ output.write(input);
}
/**
@@ -732,30 +659,23 @@ public static void copy( final byte[] input, final OutputStream output, final in
* @return true if the content of the streams are equal or they both don't exist, false otherwise
* @throws IOException io issue
*/
- public static boolean contentEquals( final InputStream input1, final InputStream input2 )
- throws IOException
- {
- final InputStream bufferedInput1 = new BufferedInputStream( input1 );
- final InputStream bufferedInput2 = new BufferedInputStream( input2 );
+ public static boolean contentEquals(final InputStream input1, final InputStream input2) throws IOException {
+ final InputStream bufferedInput1 = new BufferedInputStream(input1);
+ final InputStream bufferedInput2 = new BufferedInputStream(input2);
int ch = bufferedInput1.read();
- while ( 0 <= ch )
- {
+ while (0 <= ch) {
final int ch2 = bufferedInput2.read();
- if ( ch != ch2 )
- {
+ if (ch != ch2) {
return false;
}
ch = bufferedInput1.read();
}
final int ch2 = bufferedInput2.read();
- if ( 0 <= ch2 )
- {
+ if (0 <= ch2) {
return false;
- }
- else
- {
+ } else {
return true;
}
}
@@ -766,24 +686,19 @@ public static boolean contentEquals( final InputStream input1, final InputStream
/**
* Closes the input stream. The input stream can be null and any IOException's will be swallowed.
- *
+ *
* @param inputStream The stream to close.
* @deprecated use try-with-resources instead
*/
@Deprecated
- public static void close( InputStream inputStream )
- {
- if ( inputStream == null )
- {
+ public static void close(InputStream inputStream) {
+ if (inputStream == null) {
return;
}
- try
- {
+ try {
inputStream.close();
- }
- catch ( IOException ex )
- {
+ } catch (IOException ex) {
// ignore
}
}
@@ -795,91 +710,71 @@ public static void close( InputStream inputStream )
* @deprecated use try-with-resources instead
*/
@Deprecated
- public static void close( Channel channel )
- {
- if ( channel == null )
- {
+ public static void close(Channel channel) {
+ if (channel == null) {
return;
}
- try
- {
+ try {
channel.close();
- }
- catch ( IOException ex )
- {
+ } catch (IOException ex) {
// ignore
}
}
/**
* Closes the output stream. The output stream can be null and any IOException's will be swallowed.
- *
+ *
* @param outputStream The stream to close.
* @deprecated use try-with-resources instead
*/
@Deprecated
- public static void close( OutputStream outputStream )
- {
- if ( outputStream == null )
- {
+ public static void close(OutputStream outputStream) {
+ if (outputStream == null) {
return;
}
- try
- {
+ try {
outputStream.close();
- }
- catch ( IOException ex )
- {
+ } catch (IOException ex) {
// ignore
}
}
/**
* Closes the reader. The reader can be null and any IOException's will be swallowed.
- *
+ *
* @param reader The reader to close.
* @deprecated use try-with-resources instead
*/
@Deprecated
- public static void close( Reader reader )
- {
- if ( reader == null )
- {
+ public static void close(Reader reader) {
+ if (reader == null) {
return;
}
- try
- {
+ try {
reader.close();
- }
- catch ( IOException ex )
- {
+ } catch (IOException ex) {
// ignore
}
}
/**
* Closes the writer. The writer can be null and any IOException's will be swallowed.
- *
+ *
* @param writer The writer to close.
* @deprecated use try-with-resources instead
*/
@Deprecated
- public static void close( Writer writer )
- {
- if ( writer == null )
- {
+ public static void close(Writer writer) {
+ if (writer == null) {
return;
}
- try
- {
+ try {
writer.close();
- }
- catch ( IOException ex )
- {
+ } catch (IOException ex) {
// ignore
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java b/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
index c8515b2e..37b6768e 100644
--- a/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
+++ b/src/main/java/org/codehaus/plexus/util/InterpolationFilterReader.java
@@ -75,12 +75,10 @@
* - if the enclosed string is not found in the keyword Map, then no substitution is made; the token text is
* passed through unaltered.
*
- *
+ *
* @see LineOrientedInterpolatingReader s
*/
-public class InterpolationFilterReader
- extends FilterReader
-{
+public class InterpolationFilterReader extends FilterReader {
/** replacement text from a token */
private String replaceData = null;
@@ -113,15 +111,14 @@ public class InterpolationFilterReader
/**
* Construct a Reader to interpolate values enclosed between the given delimiter tokens.
- *
+ *
* @param in a Reader to be wrapped for interpolation.
* @param variables name/value pairs to be interpolated into the character stream.
* @param beginToken an interpolation target begins with this.
* @param endToken an interpolation target ends with this.
*/
- public InterpolationFilterReader( Reader in, Map variables, String beginToken, String endToken )
- {
- super( in );
+ public InterpolationFilterReader(Reader in, Map variables, String beginToken, String endToken) {
+ super(in);
this.variables = variables;
this.beginToken = beginToken;
@@ -133,13 +130,12 @@ public InterpolationFilterReader( Reader in, Map variables, String be
/**
* Construct a Reader using the default interpolation delimiter tokens "${" and "}".
- *
+ *
* @param in a Reader to be wrapped for interpolation.
* @param variables name/value pairs to be interpolated into the character stream.
*/
- public InterpolationFilterReader( Reader in, Map variables )
- {
- this( in, variables, DEFAULT_BEGIN_TOKEN, DEFAULT_END_TOKEN );
+ public InterpolationFilterReader(Reader in, Map variables) {
+ this(in, variables, DEFAULT_BEGIN_TOKEN, DEFAULT_END_TOKEN);
}
/**
@@ -152,18 +148,13 @@ public InterpolationFilterReader( Reader in, Map variables )
* @exception IOException If an I/O error occurs
*/
@Override
- public long skip( long n )
- throws IOException
- {
- if ( n < 0L )
- {
- throw new IllegalArgumentException( "skip value is negative" );
+ public long skip(long n) throws IOException {
+ if (n < 0L) {
+ throw new IllegalArgumentException("skip value is negative");
}
- for ( long i = 0; i < n; i++ )
- {
- if ( read() == -1 )
- {
+ for (long i = 0; i < n; i++) {
+ if (read() == -1) {
return i;
}
}
@@ -181,20 +172,13 @@ public long skip( long n )
* @exception IOException If an I/O error occurs
*/
@Override
- public int read( char cbuf[], int off, int len )
- throws IOException
- {
- for ( int i = 0; i < len; i++ )
- {
+ public int read(char cbuf[], int off, int len) throws IOException {
+ for (int i = 0; i < len; i++) {
int ch = read();
- if ( ch == -1 )
- {
- if ( i == 0 )
- {
+ if (ch == -1) {
+ if (i == 0) {
return -1;
- }
- else
- {
+ } else {
return i;
}
}
@@ -210,127 +194,94 @@ public int read( char cbuf[], int off, int len )
* @exception IOException if the underlying stream throws an IOException during reading
*/
@Override
- public int read()
- throws IOException
- {
- if ( replaceIndex != -1 && replaceIndex < replaceData.length() )
- {
- int ch = replaceData.charAt( replaceIndex++ );
- if ( replaceIndex >= replaceData.length() )
- {
+ public int read() throws IOException {
+ if (replaceIndex != -1 && replaceIndex < replaceData.length()) {
+ int ch = replaceData.charAt(replaceIndex++);
+ if (replaceIndex >= replaceData.length()) {
replaceIndex = -1;
}
return ch;
}
int ch;
- if ( previousIndex != -1 && previousIndex < endTokenLength )
- {
- ch = endToken.charAt( previousIndex++ );
- }
- else
- {
+ if (previousIndex != -1 && previousIndex < endTokenLength) {
+ ch = endToken.charAt(previousIndex++);
+ } else {
ch = in.read();
}
- if ( ch == beginToken.charAt( 0 ) )
- {
+ if (ch == beginToken.charAt(0)) {
StringBuilder key = new StringBuilder();
int beginTokenMatchPos = 1;
- do
- {
- if ( previousIndex != -1 && previousIndex < endTokenLength )
- {
- ch = endToken.charAt( previousIndex++ );
- }
- else
- {
+ do {
+ if (previousIndex != -1 && previousIndex < endTokenLength) {
+ ch = endToken.charAt(previousIndex++);
+ } else {
ch = in.read();
}
- if ( ch != -1 )
- {
- key.append( (char) ch );
+ if (ch != -1) {
+ key.append((char) ch);
- if ( ( beginTokenMatchPos < beginTokenLength )
- && ( ch != beginToken.charAt( beginTokenMatchPos++ ) ) )
- {
+ if ((beginTokenMatchPos < beginTokenLength) && (ch != beginToken.charAt(beginTokenMatchPos++))) {
ch = -1; // not really EOF but to trigger code below
break;
}
- }
- else
- {
+ } else {
break;
}
- }
- while ( ch != endToken.charAt( 0 ) );
+ } while (ch != endToken.charAt(0));
// now test endToken
- if ( ch != -1 && endTokenLength > 1 )
- {
+ if (ch != -1 && endTokenLength > 1) {
int endTokenMatchPos = 1;
- do
- {
- if ( previousIndex != -1 && previousIndex < endTokenLength )
- {
- ch = endToken.charAt( previousIndex++ );
- }
- else
- {
+ do {
+ if (previousIndex != -1 && previousIndex < endTokenLength) {
+ ch = endToken.charAt(previousIndex++);
+ } else {
ch = in.read();
}
- if ( ch != -1 )
- {
- key.append( (char) ch );
+ if (ch != -1) {
+ key.append((char) ch);
- if ( ch != endToken.charAt( endTokenMatchPos++ ) )
- {
+ if (ch != endToken.charAt(endTokenMatchPos++)) {
ch = -1; // not really EOF but to trigger code below
break;
}
- }
- else
- {
+ } else {
break;
}
- }
- while ( endTokenMatchPos < endTokenLength );
+ } while (endTokenMatchPos < endTokenLength);
}
// There is nothing left to read so we have the situation where the begin/end token
// are in fact the same and as there is nothing left to read we have got ourselves
// end of a token boundary so let it pass through.
- if ( ch == -1 )
- {
+ if (ch == -1) {
replaceData = key.toString();
replaceIndex = 0;
- return beginToken.charAt( 0 );
+ return beginToken.charAt(0);
}
- String variableKey = key.substring( beginTokenLength - 1, key.length() - endTokenLength );
+ String variableKey = key.substring(beginTokenLength - 1, key.length() - endTokenLength);
- Object o = variables.get( variableKey );
- if ( o != null )
- {
+ Object o = variables.get(variableKey);
+ if (o != null) {
String value = o.toString();
- if ( value.length() != 0 )
- {
+ if (value.length() != 0) {
replaceData = value;
replaceIndex = 0;
}
return read();
- }
- else
- {
+ } else {
previousIndex = 0;
- replaceData = key.substring( 0, key.length() - endTokenLength );
+ replaceData = key.substring(0, key.length() - endTokenLength);
replaceIndex = 0;
- return beginToken.charAt( 0 );
+ return beginToken.charAt(0);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java b/src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java
index 8129018f..6670a411 100644
--- a/src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java
+++ b/src/main/java/org/codehaus/plexus/util/LineOrientedInterpolatingReader.java
@@ -16,9 +16,6 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.reflection.Reflector;
-import org.codehaus.plexus.util.reflection.ReflectorException;
-
import java.io.FilterReader;
import java.io.IOException;
import java.io.PushbackReader;
@@ -29,6 +26,9 @@
import java.util.Set;
import java.util.TreeMap;
+import org.codehaus.plexus.util.reflection.Reflector;
+import org.codehaus.plexus.util.reflection.ReflectorException;
+
/**
* A FilterReader which interpolates keyword values into a character stream. Keywords are recognized when enclosed
* between starting and ending delimiter strings. The keywords themselves, and their values, are fetched from a Map
@@ -44,17 +44,15 @@
* - if the enclosed string is not found in the keyword Map, then no substitution is made; the token text is
* passed through unaltered.
*
- *
+ *
* A token in the incoming character stream may be escaped by prepending an "escape sequence" which is
* specified to the constructor. An escaped token is passed through as written, with the escape sequence removed. This
* allows things which would look like tokens to be read literally rather than interpolated.
- *
+ *
* @author jdcasey Created on Feb 3, 2005
* @see InterpolationFilterReader
*/
-public class LineOrientedInterpolatingReader
- extends FilterReader
-{
+public class LineOrientedInterpolatingReader extends FilterReader {
public static final String DEFAULT_START_DELIM = "${";
public static final String DEFAULT_END_DELIM = "}";
@@ -85,17 +83,16 @@ public class LineOrientedInterpolatingReader
/**
* Construct an interpolating Reader, specifying token delimiters and the escape sequence.
- *
+ *
* @param reader the Reader to be filtered.
* @param context keyword/value pairs for interpolation.
* @param startDelim character sequence which (possibly) begins a token.
* @param endDelim character sequence which ends a token.
* @param escapeSeq escape sequence
*/
- public LineOrientedInterpolatingReader( Reader reader, Map context, String startDelim, String endDelim,
- String escapeSeq )
- {
- super( reader );
+ public LineOrientedInterpolatingReader(
+ Reader reader, Map context, String startDelim, String endDelim, String escapeSeq) {
+ super(reader);
this.startDelim = startDelim;
@@ -106,86 +103,70 @@ public LineOrientedInterpolatingReader( Reader reader, Map context, S
// Expressions have to be at least this size...
this.minExpressionSize = startDelim.length() + endDelim.length() + 1;
- this.context = Collections.unmodifiableMap( context );
+ this.context = Collections.unmodifiableMap(context);
this.reflector = new Reflector();
- if ( reader instanceof PushbackReader )
- {
+ if (reader instanceof PushbackReader) {
this.pushbackReader = (PushbackReader) reader;
- }
- else
- {
- this.pushbackReader = new PushbackReader( reader, 1 );
+ } else {
+ this.pushbackReader = new PushbackReader(reader, 1);
}
}
/**
* Filters a Reader using the default escape sequence "\".
- *
+ *
* @param reader the Reader to be filtered.
* @param context keyword/value pairs for interpolation.
* @param startDelim the character sequence which (possibly) begins a token.
* @param endDelim the character sequence which ends a token.
*/
- public LineOrientedInterpolatingReader( Reader reader, Map context, String startDelim, String endDelim )
- {
- this( reader, context, startDelim, endDelim, DEFAULT_ESCAPE_SEQ );
+ public LineOrientedInterpolatingReader(Reader reader, Map context, String startDelim, String endDelim) {
+ this(reader, context, startDelim, endDelim, DEFAULT_ESCAPE_SEQ);
}
/**
* Filters a Reader using the default escape sequence "\" and token delimiters "${", "}".
- *
+ *
* @param reader the Reader to be filtered.
* @param context keyword/value pairs for interpolation.
*/
- public LineOrientedInterpolatingReader( Reader reader, Map context )
- {
- this( reader, context, DEFAULT_START_DELIM, DEFAULT_END_DELIM, DEFAULT_ESCAPE_SEQ );
+ public LineOrientedInterpolatingReader(Reader reader, Map context) {
+ this(reader, context, DEFAULT_START_DELIM, DEFAULT_END_DELIM, DEFAULT_ESCAPE_SEQ);
}
@Override
- public int read()
- throws IOException
- {
- if ( line == null || lineIdx >= line.length() )
- {
+ public int read() throws IOException {
+ if (line == null || lineIdx >= line.length()) {
readAndInterpolateLine();
}
int next = -1;
- if ( line != null && lineIdx < line.length() )
- {
- next = line.charAt( lineIdx++ );
+ if (line != null && lineIdx < line.length()) {
+ next = line.charAt(lineIdx++);
}
return next;
}
@Override
- public int read( char[] cbuf, int off, int len )
- throws IOException
- {
+ public int read(char[] cbuf, int off, int len) throws IOException {
int fillCount = 0;
- for ( int i = off; i < off + len; i++ )
- {
+ for (int i = off; i < off + len; i++) {
int next = read();
- if ( next > -1 )
- {
+ if (next > -1) {
cbuf[i] = (char) next;
- }
- else
- {
+ } else {
break;
}
fillCount++;
}
- if ( fillCount == 0 )
- {
+ if (fillCount == 0) {
fillCount = -1;
}
@@ -193,17 +174,13 @@ public int read( char[] cbuf, int off, int len )
}
@Override
- public long skip( long n )
- throws IOException
- {
+ public long skip(long n) throws IOException {
long skipCount = 0;
- for ( long i = 0; i < n; i++ )
- {
+ for (long i = 0; i < n; i++) {
int next = read();
- if ( next < 0 )
- {
+ if (next < 0) {
break;
}
@@ -213,27 +190,21 @@ public long skip( long n )
return skipCount;
}
- private void readAndInterpolateLine()
- throws IOException
- {
+ private void readAndInterpolateLine() throws IOException {
String rawLine = readLine();
- if ( rawLine != null )
- {
- Set expressions = parseForExpressions( rawLine );
+ if (rawLine != null) {
+ Set expressions = parseForExpressions(rawLine);
- Map evaluatedExpressions = evaluateExpressions( expressions );
+ Map evaluatedExpressions = evaluateExpressions(expressions);
- String interpolated = replaceWithInterpolatedValues( rawLine, evaluatedExpressions );
+ String interpolated = replaceWithInterpolatedValues(rawLine, evaluatedExpressions);
- if ( interpolated != null && interpolated.length() > 0 )
- {
+ if (interpolated != null && interpolated.length() > 0) {
line = interpolated;
lineIdx = 0;
}
- }
- else
- {
+ } else {
line = null;
lineIdx = -1;
}
@@ -243,97 +214,73 @@ private void readAndInterpolateLine()
* Read one line from the wrapped Reader. A line is a sequence of characters ending in CRLF, CR, or LF. The
* terminating character(s) will be included in the returned line.
*/
- private String readLine()
- throws IOException
- {
- StringBuilder lineBuffer = new StringBuilder( 40 ); // half of the "normal" line maxsize
+ private String readLine() throws IOException {
+ StringBuilder lineBuffer = new StringBuilder(40); // half of the "normal" line maxsize
int next;
boolean lastWasCR = false;
- while ( ( next = pushbackReader.read() ) > -1 )
- {
+ while ((next = pushbackReader.read()) > -1) {
char c = (char) next;
- if ( c == CARRIAGE_RETURN_CHAR )
- {
+ if (c == CARRIAGE_RETURN_CHAR) {
lastWasCR = true;
- lineBuffer.append( c );
- }
- else if ( c == NEWLINE_CHAR )
- {
- lineBuffer.append( c );
+ lineBuffer.append(c);
+ } else if (c == NEWLINE_CHAR) {
+ lineBuffer.append(c);
break; // end of line.
- }
- else if ( lastWasCR )
- {
- pushbackReader.unread( c );
+ } else if (lastWasCR) {
+ pushbackReader.unread(c);
break;
- }
- else
- {
- lineBuffer.append( c );
+ } else {
+ lineBuffer.append(c);
}
}
- if ( lineBuffer.length() < 1 )
- {
+ if (lineBuffer.length() < 1) {
return null;
- }
- else
- {
+ } else {
return lineBuffer.toString();
}
}
- private String replaceWithInterpolatedValues( String rawLine, Map evaluatedExpressions )
- {
+ private String replaceWithInterpolatedValues(String rawLine, Map evaluatedExpressions) {
String result = rawLine;
- for ( Object o : evaluatedExpressions.entrySet() )
- {
+ for (Object o : evaluatedExpressions.entrySet()) {
Map.Entry entry = (Map.Entry) o;
String expression = (String) entry.getKey();
- String value = String.valueOf( entry.getValue() );
+ String value = String.valueOf(entry.getValue());
- result = findAndReplaceUnlessEscaped( result, expression, value );
+ result = findAndReplaceUnlessEscaped(result, expression, value);
}
return result;
}
- private Map evaluateExpressions( Set expressions )
- {
+ private Map evaluateExpressions(Set expressions) {
Map evaluated = new TreeMap();
- for ( Object expression : expressions )
- {
+ for (Object expression : expressions) {
String rawExpression = (String) expression;
String realExpression =
- rawExpression.substring( startDelim.length(), rawExpression.length() - endDelim.length() );
-
- String[] parts = realExpression.split( "\\." );
- if ( parts.length > 0 )
- {
- Object value = context.get( parts[0] );
-
- if ( value != null )
- {
- for ( int i = 1; i < parts.length; i++ )
- {
- try
- {
- value = reflector.getObjectProperty( value, parts[i] );
-
- if ( value == null )
- {
+ rawExpression.substring(startDelim.length(), rawExpression.length() - endDelim.length());
+
+ String[] parts = realExpression.split("\\.");
+ if (parts.length > 0) {
+ Object value = context.get(parts[0]);
+
+ if (value != null) {
+ for (int i = 1; i < parts.length; i++) {
+ try {
+ value = reflector.getObjectProperty(value, parts[i]);
+
+ if (value == null) {
break;
}
- }
- catch ( ReflectorException e )
- {
+ } catch (ReflectorException e) {
// TODO: Fix this! It should report, but not interrupt.
e.printStackTrace();
@@ -341,7 +288,7 @@ private Map evaluateExpressions( Set expressions )
}
}
- evaluated.put( rawExpression, value );
+ evaluated.put(rawExpression, value);
}
}
}
@@ -349,32 +296,27 @@ private Map evaluateExpressions( Set expressions )
return evaluated;
}
- private Set parseForExpressions( String rawLine )
- {
+ private Set parseForExpressions(String rawLine) {
Set expressions = new HashSet();
- if ( rawLine != null )
- {
+ if (rawLine != null) {
int placeholder = -1;
- do
- {
+ do {
// find the beginning of the next expression.
- int start = findDelimiter( rawLine, startDelim, placeholder );
+ int start = findDelimiter(rawLine, startDelim, placeholder);
// if we can't find a start-delimiter, then there is no valid expression. Ignore everything else.
- if ( start < 0 )
- {
+ if (start < 0) {
// no expression found.
break;
}
// find the end of the next expression.
- int end = findDelimiter( rawLine, endDelim, start + 1 );
+ int end = findDelimiter(rawLine, endDelim, start + 1);
// if we can't find an end-delimiter, then this is not a valid expression. Ignore it.
- if ( end < 0 )
- {
+ if (end < 0) {
// no VALID expression found.
break;
}
@@ -382,93 +324,73 @@ private Set parseForExpressions( String rawLine )
// if we reach this point, we have a valid start and end position, which
// means we have a valid expression. So, we add it to the set of
// expressions in need of evaluation.
- expressions.add( rawLine.substring( start, end + endDelim.length() ) );
+ expressions.add(rawLine.substring(start, end + endDelim.length()));
// increment the placeholder so we can look beyond this expression.
placeholder = end + 1;
- }
- while ( placeholder < rawLine.length() - minExpressionSize );
+ } while (placeholder < rawLine.length() - minExpressionSize);
}
return expressions;
}
- private int findDelimiter( String rawLine, String delimiter, int lastPos )
- {
+ private int findDelimiter(String rawLine, String delimiter, int lastPos) {
int placeholder = lastPos;
int position;
- do
- {
- position = rawLine.indexOf( delimiter, placeholder );
+ do {
+ position = rawLine.indexOf(delimiter, placeholder);
- if ( position < 0 )
- {
+ if (position < 0) {
break;
- }
- else
- {
- int escEndIdx = rawLine.indexOf( escapeSeq, placeholder ) + escapeSeq.length();
+ } else {
+ int escEndIdx = rawLine.indexOf(escapeSeq, placeholder) + escapeSeq.length();
- if ( escEndIdx > escapeSeq.length() - 1 && escEndIdx == position )
- {
+ if (escEndIdx > escapeSeq.length() - 1 && escEndIdx == position) {
placeholder = position + 1;
position = -1;
}
}
- }
- while ( position < 0 && placeholder < rawLine.length() - endDelim.length() );
+ } while (position < 0 && placeholder < rawLine.length() - endDelim.length());
// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
// use length() - endDelim.length() b/c otherwise there is nothing left to search.
return position;
}
- private String findAndReplaceUnlessEscaped( String rawLine, String search, String replace )
- {
- StringBuilder lineBuffer = new StringBuilder( (int) ( rawLine.length() * 1.5 ) );
+ private String findAndReplaceUnlessEscaped(String rawLine, String search, String replace) {
+ StringBuilder lineBuffer = new StringBuilder((int) (rawLine.length() * 1.5));
int lastReplacement = -1;
- do
- {
- int nextReplacement = rawLine.indexOf( search, lastReplacement + 1 );
- if ( nextReplacement > -1 )
- {
- if ( lastReplacement < 0 )
- {
+ do {
+ int nextReplacement = rawLine.indexOf(search, lastReplacement + 1);
+ if (nextReplacement > -1) {
+ if (lastReplacement < 0) {
lastReplacement = 0;
}
- lineBuffer.append( rawLine, lastReplacement, nextReplacement );
+ lineBuffer.append(rawLine, lastReplacement, nextReplacement);
- int escIdx = rawLine.indexOf( escapeSeq, lastReplacement + 1 );
- if ( escIdx > -1 && escIdx + escapeSeq.length() == nextReplacement )
- {
- lineBuffer.setLength( lineBuffer.length() - escapeSeq.length() );
- lineBuffer.append( search );
- }
- else
- {
- lineBuffer.append( replace );
+ int escIdx = rawLine.indexOf(escapeSeq, lastReplacement + 1);
+ if (escIdx > -1 && escIdx + escapeSeq.length() == nextReplacement) {
+ lineBuffer.setLength(lineBuffer.length() - escapeSeq.length());
+ lineBuffer.append(search);
+ } else {
+ lineBuffer.append(replace);
}
lastReplacement = nextReplacement + search.length();
- }
- else
- {
+ } else {
break;
}
- }
- while ( lastReplacement > -1 );
+ } while (lastReplacement > -1);
- if ( lastReplacement < rawLine.length() )
- {
- lineBuffer.append( rawLine, lastReplacement, rawLine.length() );
+ if (lastReplacement < rawLine.length()) {
+ lineBuffer.append(rawLine, lastReplacement, rawLine.length());
}
return lineBuffer.toString();
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/MatchPattern.java b/src/main/java/org/codehaus/plexus/util/MatchPattern.java
index de57de21..93381c51 100644
--- a/src/main/java/org/codehaus/plexus/util/MatchPattern.java
+++ b/src/main/java/org/codehaus/plexus/util/MatchPattern.java
@@ -23,13 +23,12 @@
/**
* Describes a match target for SelectorUtils.
- *
+ *
* Significantly more efficient than using strings, since re-evaluation and re-tokenizing is avoided.
*
* @author Kristian Rosenvold
*/
-public class MatchPattern
-{
+public class MatchPattern {
private final String source;
private final String regexPattern;
@@ -40,107 +39,93 @@ public class MatchPattern
private final char[][] tokenizedChar;
- private MatchPattern( String source, String separator )
- {
- regexPattern = SelectorUtils.isRegexPrefixedPattern( source )
- ? source.substring( SelectorUtils.REGEX_HANDLER_PREFIX.length(),
- source.length() - SelectorUtils.PATTERN_HANDLER_SUFFIX.length() )
- : null;
- this.source = SelectorUtils.isAntPrefixedPattern( source )
- ? source.substring( SelectorUtils.ANT_HANDLER_PREFIX.length(),
- source.length() - SelectorUtils.PATTERN_HANDLER_SUFFIX.length() )
- : source;
+ private MatchPattern(String source, String separator) {
+ regexPattern = SelectorUtils.isRegexPrefixedPattern(source)
+ ? source.substring(
+ SelectorUtils.REGEX_HANDLER_PREFIX.length(),
+ source.length() - SelectorUtils.PATTERN_HANDLER_SUFFIX.length())
+ : null;
+ this.source = SelectorUtils.isAntPrefixedPattern(source)
+ ? source.substring(
+ SelectorUtils.ANT_HANDLER_PREFIX.length(),
+ source.length() - SelectorUtils.PATTERN_HANDLER_SUFFIX.length())
+ : source;
this.separator = separator;
- tokenized = tokenizePathToString( this.source, separator );
+ tokenized = tokenizePathToString(this.source, separator);
tokenizedChar = new char[tokenized.length][];
- for ( int i = 0; i < tokenized.length; i++ )
- {
+ for (int i = 0; i < tokenized.length; i++) {
tokenizedChar[i] = tokenized[i].toCharArray();
}
+ }
+ /**
+ * Gets the source pattern for this match pattern.
+ * @return the source string without Ant or Regex pattern markers.
+ */
+ public String getSource() {
+ return regexPattern == null ? source : regexPattern;
}
- public boolean matchPath( String str, boolean isCaseSensitive )
- {
- if ( regexPattern != null )
- {
- return str.matches( regexPattern );
- }
- else
- {
- return SelectorUtils.matchAntPathPattern( this, str, separator, isCaseSensitive );
+ public boolean matchPath(String str, boolean isCaseSensitive) {
+ if (regexPattern != null) {
+ return str.matches(regexPattern);
+ } else {
+ return SelectorUtils.matchAntPathPattern(this, str, separator, isCaseSensitive);
}
}
- boolean matchPath( String str, char[][] strDirs, boolean isCaseSensitive )
- {
- if ( regexPattern != null )
- {
- return str.matches( regexPattern );
- }
- else
- {
- return SelectorUtils.matchAntPathPattern( getTokenizedPathChars(), strDirs, isCaseSensitive );
+ boolean matchPath(String str, char[][] strDirs, boolean isCaseSensitive) {
+ if (regexPattern != null) {
+ return str.matches(regexPattern);
+ } else {
+ return SelectorUtils.matchAntPathPattern(getTokenizedPathChars(), strDirs, isCaseSensitive);
}
}
- public boolean matchPatternStart( String str, boolean isCaseSensitive )
- {
- if ( regexPattern != null )
- {
+ public boolean matchPatternStart(String str, boolean isCaseSensitive) {
+ if (regexPattern != null) {
// FIXME: ICK! But we can't do partial matches for regex, so we have to reserve judgement until we have
// a file to deal with, or we can definitely say this is an exclusion...
return true;
- }
- else
- {
- String altStr = str.replace( '\\', '/' );
+ } else {
+ String altStr = str.replace('\\', '/');
- return SelectorUtils.matchAntPathPatternStart( this, str, File.separator, isCaseSensitive )
- || SelectorUtils.matchAntPathPatternStart( this, altStr, "/", isCaseSensitive );
+ return SelectorUtils.matchAntPathPatternStart(this, str, File.separator, isCaseSensitive)
+ || SelectorUtils.matchAntPathPatternStart(this, altStr, "/", isCaseSensitive);
}
}
- public String[] getTokenizedPathString()
- {
+ public String[] getTokenizedPathString() {
return tokenized;
}
- public char[][] getTokenizedPathChars()
- {
+ public char[][] getTokenizedPathChars() {
return tokenizedChar;
}
- public boolean startsWith( String string )
- {
- return source.startsWith( string );
+ public boolean startsWith(String string) {
+ return source.startsWith(string);
}
- static String[] tokenizePathToString( String path, String separator )
- {
+ public static String[] tokenizePathToString(String path, String separator) {
List ret = new ArrayList();
- StringTokenizer st = new StringTokenizer( path, separator );
- while ( st.hasMoreTokens() )
- {
- ret.add( st.nextToken() );
+ StringTokenizer st = new StringTokenizer(path, separator);
+ while (st.hasMoreTokens()) {
+ ret.add(st.nextToken());
}
- return ret.toArray( new String[0] );
+ return ret.toArray(new String[0]);
}
- static char[][] tokenizePathToCharArray( String path, String separator )
- {
- String[] tokenizedName = tokenizePathToString( path, separator );
+ static char[][] tokenizePathToCharArray(String path, String separator) {
+ String[] tokenizedName = tokenizePathToString(path, separator);
char[][] tokenizedNameChar = new char[tokenizedName.length][];
- for ( int i = 0; i < tokenizedName.length; i++ )
- {
+ for (int i = 0; i < tokenizedName.length; i++) {
tokenizedNameChar[i] = tokenizedName[i].toCharArray();
}
return tokenizedNameChar;
}
- public static MatchPattern fromString( String source )
- {
- return new MatchPattern( source, File.separator );
+ public static MatchPattern fromString(String source) {
+ return new MatchPattern(source, File.separator);
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/MatchPatterns.java b/src/main/java/org/codehaus/plexus/util/MatchPatterns.java
index 35f9ea22..9c14bf00 100644
--- a/src/main/java/org/codehaus/plexus/util/MatchPatterns.java
+++ b/src/main/java/org/codehaus/plexus/util/MatchPatterns.java
@@ -9,88 +9,83 @@
*
* @author Kristian Rosenvold
*/
-public class MatchPatterns
-{
+public class MatchPatterns {
private final MatchPattern[] patterns;
- private MatchPatterns( MatchPattern[] patterns )
- {
+ private MatchPatterns(MatchPattern[] patterns) {
this.patterns = patterns;
}
+ /**
+ * Gets a list of enclosed MatchPattern sources.
+ * @return A list of enclosed MatchPattern sources.
+ */
+ public List getSources() {
+ List sources = new ArrayList<>();
+ for (MatchPattern pattern : patterns) {
+ sources.add(pattern.getSource());
+ }
+ return sources;
+ }
+
/**
* Checks these MatchPatterns against a specified string.
- *
+ *
* Uses far less string tokenization than any of the alternatives.
*
* @param name The name to look for
* @param isCaseSensitive If the comparison is case sensitive
* @return true if any of the supplied patterns match
*/
- public boolean matches( String name, boolean isCaseSensitive )
- {
- String[] tokenized = MatchPattern.tokenizePathToString( name, File.separator );
- return matches( name, tokenized, isCaseSensitive );
+ public boolean matches(String name, boolean isCaseSensitive) {
+ String[] tokenized = MatchPattern.tokenizePathToString(name, File.separator);
+ return matches(name, tokenized, isCaseSensitive);
}
- public boolean matches( String name, String[] tokenizedName, boolean isCaseSensitive )
- {
+ public boolean matches(String name, String[] tokenizedName, boolean isCaseSensitive) {
char[][] tokenizedNameChar = new char[tokenizedName.length][];
- for ( int i = 0; i < tokenizedName.length; i++ )
- {
+ for (int i = 0; i < tokenizedName.length; i++) {
tokenizedNameChar[i] = tokenizedName[i].toCharArray();
}
return matches(name, tokenizedNameChar, isCaseSensitive);
}
- public boolean matches(String name, char[][] tokenizedNameChar, boolean isCaseSensitive)
- {
- for ( MatchPattern pattern : patterns )
- {
- if ( pattern.matchPath( name, tokenizedNameChar, isCaseSensitive ) )
- {
+ public boolean matches(String name, char[][] tokenizedNameChar, boolean isCaseSensitive) {
+ for (MatchPattern pattern : patterns) {
+ if (pattern.matchPath(name, tokenizedNameChar, isCaseSensitive)) {
return true;
}
}
return false;
}
- public boolean matchesPatternStart( String name, boolean isCaseSensitive )
- {
- for ( MatchPattern includesPattern : patterns )
- {
- if ( includesPattern.matchPatternStart( name, isCaseSensitive ) )
- {
+ public boolean matchesPatternStart(String name, boolean isCaseSensitive) {
+ for (MatchPattern includesPattern : patterns) {
+ if (includesPattern.matchPatternStart(name, isCaseSensitive)) {
return true;
}
}
return false;
}
- public static MatchPatterns from( String... sources )
- {
+ public static MatchPatterns from(String... sources) {
final int length = sources.length;
MatchPattern[] result = new MatchPattern[length];
- for ( int i = 0; i < length; i++ )
- {
- result[i] = MatchPattern.fromString( sources[i] );
+ for (int i = 0; i < length; i++) {
+ result[i] = MatchPattern.fromString(sources[i]);
}
- return new MatchPatterns( result );
+ return new MatchPatterns(result);
}
- public static MatchPatterns from( Iterable strings )
- {
- return new MatchPatterns( getMatchPatterns( strings ) );
+ public static MatchPatterns from(Iterable strings) {
+ return new MatchPatterns(getMatchPatterns(strings));
}
- private static MatchPattern[] getMatchPatterns( Iterable items )
- {
+ private static MatchPattern[] getMatchPatterns(Iterable items) {
List result = new ArrayList();
- for ( String string : items )
- {
- result.add( MatchPattern.fromString( string ) );
+ for (String string : items) {
+ result.add(MatchPattern.fromString(string));
}
- return result.toArray( new MatchPattern[0] );
+ return result.toArray(new MatchPattern[0]);
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/NioFiles.java b/src/main/java/org/codehaus/plexus/util/NioFiles.java
index eb62bac7..d7a00a78 100644
--- a/src/main/java/org/codehaus/plexus/util/NioFiles.java
+++ b/src/main/java/org/codehaus/plexus/util/NioFiles.java
@@ -30,74 +30,57 @@
/**
* Encapsulates use of java7 features, exposing mostly backward compatible types
*/
-@SuppressWarnings( "Since15" )
-public class NioFiles
-{
- public static boolean isSymbolicLink( File file )
- {
- return Files.isSymbolicLink( file.toPath() );
+@SuppressWarnings("Since15")
+public class NioFiles {
+ public static boolean isSymbolicLink(File file) {
+ return Files.isSymbolicLink(file.toPath());
}
- public static void chmod( File file, int mode )
- throws IOException
- {
+ public static void chmod(File file, int mode) throws IOException {
Path path = file.toPath();
- if ( !Files.isSymbolicLink( path ) )
- {
- Files.setPosixFilePermissions( path, getPermissions( mode ) );
+ if (!Files.isSymbolicLink(path)) {
+ Files.setPosixFilePermissions(path, getPermissions(mode));
}
}
- @SuppressWarnings( { "OctalInteger", "MagicNumber" } )
- private static Set getPermissions( int mode )
- {
+ @SuppressWarnings({"OctalInteger", "MagicNumber"})
+ private static Set getPermissions(int mode) {
Set perms = new HashSet<>();
// add owners permission
- if ( ( mode & 0400 ) > 0 )
- {
- perms.add( PosixFilePermission.OWNER_READ );
+ if ((mode & 0400) > 0) {
+ perms.add(PosixFilePermission.OWNER_READ);
}
- if ( ( mode & 0200 ) > 0 )
- {
- perms.add( PosixFilePermission.OWNER_WRITE );
+ if ((mode & 0200) > 0) {
+ perms.add(PosixFilePermission.OWNER_WRITE);
}
- if ( ( mode & 0100 ) > 0 )
- {
- perms.add( PosixFilePermission.OWNER_EXECUTE );
+ if ((mode & 0100) > 0) {
+ perms.add(PosixFilePermission.OWNER_EXECUTE);
}
// add group permissions
- if ( ( mode & 0040 ) > 0 )
- {
- perms.add( PosixFilePermission.GROUP_READ );
+ if ((mode & 0040) > 0) {
+ perms.add(PosixFilePermission.GROUP_READ);
}
- if ( ( mode & 0020 ) > 0 )
- {
- perms.add( PosixFilePermission.GROUP_WRITE );
+ if ((mode & 0020) > 0) {
+ perms.add(PosixFilePermission.GROUP_WRITE);
}
- if ( ( mode & 0010 ) > 0 )
- {
- perms.add( PosixFilePermission.GROUP_EXECUTE );
+ if ((mode & 0010) > 0) {
+ perms.add(PosixFilePermission.GROUP_EXECUTE);
}
// add others permissions
- if ( ( mode & 0004 ) > 0 )
- {
- perms.add( PosixFilePermission.OTHERS_READ );
+ if ((mode & 0004) > 0) {
+ perms.add(PosixFilePermission.OTHERS_READ);
}
- if ( ( mode & 0002 ) > 0 )
- {
- perms.add( PosixFilePermission.OTHERS_WRITE );
+ if ((mode & 0002) > 0) {
+ perms.add(PosixFilePermission.OTHERS_WRITE);
}
- if ( ( mode & 0001 ) > 0 )
- {
- perms.add( PosixFilePermission.OTHERS_EXECUTE );
+ if ((mode & 0001) > 0) {
+ perms.add(PosixFilePermission.OTHERS_EXECUTE);
}
return perms;
}
- public static long getLastModified( File file )
- throws IOException
- {
- BasicFileAttributes basicFileAttributes = Files.readAttributes( file.toPath(), BasicFileAttributes.class );
+ public static long getLastModified(File file) throws IOException {
+ BasicFileAttributes basicFileAttributes = Files.readAttributes(file.toPath(), BasicFileAttributes.class);
return basicFileAttributes.lastModifiedTime().toMillis();
}
@@ -108,38 +91,30 @@ public static long getLastModified( File file )
* @return A file that is the target of the symlink
* @throws java.io.IOException io issue
*/
-
- public static File readSymbolicLink( File symlink )
- throws IOException
- {
- Path path = Files.readSymbolicLink( symlink.toPath() );
+ public static File readSymbolicLink(File symlink) throws IOException {
+ Path path = Files.readSymbolicLink(symlink.toPath());
return path.toFile();
}
- public static File createSymbolicLink( File symlink, File target )
- throws IOException
- {
+ public static File createSymbolicLink(File symlink, File target) throws IOException {
Path link = symlink.toPath();
- if ( Files.exists( link, LinkOption.NOFOLLOW_LINKS ) )
- {
- Files.delete( link );
+ if (Files.exists(link, LinkOption.NOFOLLOW_LINKS)) {
+ Files.delete(link);
}
- link = Files.createSymbolicLink( link, target.toPath() );
+ link = Files.createSymbolicLink(link, target.toPath());
return link.toFile();
}
- public static boolean deleteIfExists( File file )
- throws IOException
- {
- return Files.deleteIfExists( file.toPath() );
+ public static boolean deleteIfExists(File file) throws IOException {
+ return Files.deleteIfExists(file.toPath());
}
- public static File copy( File source, File target )
- throws IOException
- {
- Path copy = Files.copy( source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING,
- StandardCopyOption.COPY_ATTRIBUTES );
+ public static File copy(File source, File target) throws IOException {
+ Path copy = Files.copy(
+ source.toPath(),
+ target.toPath(),
+ StandardCopyOption.REPLACE_EXISTING,
+ StandardCopyOption.COPY_ATTRIBUTES);
return copy.toFile();
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/Os.java b/src/main/java/org/codehaus/plexus/util/Os.java
index b4ed2882..95b29cb6 100644
--- a/src/main/java/org/codehaus/plexus/util/Os.java
+++ b/src/main/java/org/codehaus/plexus/util/Os.java
@@ -67,8 +67,7 @@
* @since 1.0
*
*/
-public class Os
-{
+public class Os {
// define the families for easier reference
public static final String FAMILY_DOS = "dos";
@@ -96,13 +95,13 @@ public class Os
private static final Set validFamilies = setValidFamilies();
// get the current info
- private static final String PATH_SEP = System.getProperty( "path.separator" );
+ private static final String PATH_SEP = System.getProperty("path.separator");
- public static final String OS_NAME = System.getProperty( "os.name" ).toLowerCase( Locale.US );
+ public static final String OS_NAME = System.getProperty("os.name").toLowerCase(Locale.US);
- public static final String OS_ARCH = System.getProperty( "os.arch" ).toLowerCase( Locale.US );
+ public static final String OS_ARCH = System.getProperty("os.arch").toLowerCase(Locale.US);
- public static final String OS_VERSION = System.getProperty( "os.version" ).toLowerCase( Locale.US );
+ public static final String OS_VERSION = System.getProperty("os.version").toLowerCase(Locale.US);
// Make sure this method is called after static fields it depends on have been set!
public static final String OS_FAMILY = getOsFamily();
@@ -118,44 +117,40 @@ public class Os
/**
* Default constructor
*/
- public Os()
- {
- }
+ public Os() {}
/**
* Constructor that sets the family attribute
- *
+ *
* @param family a String value
*/
- public Os( String family )
- {
- setFamily( family );
+ public Os(String family) {
+ setFamily(family);
}
/**
* Initializes the set of valid families.
*/
- private static Set setValidFamilies()
- {
+ private static Set setValidFamilies() {
Set valid = new HashSet();
- valid.add( FAMILY_DOS );
- valid.add( FAMILY_MAC );
- valid.add( FAMILY_NETWARE );
- valid.add( FAMILY_OS2 );
- valid.add( FAMILY_TANDEM );
- valid.add( FAMILY_UNIX );
- valid.add( FAMILY_WINDOWS );
- valid.add( FAMILY_WIN9X );
- valid.add( FAMILY_ZOS );
- valid.add( FAMILY_OS400 );
- valid.add( FAMILY_OPENVMS );
+ valid.add(FAMILY_DOS);
+ valid.add(FAMILY_MAC);
+ valid.add(FAMILY_NETWARE);
+ valid.add(FAMILY_OS2);
+ valid.add(FAMILY_TANDEM);
+ valid.add(FAMILY_UNIX);
+ valid.add(FAMILY_WINDOWS);
+ valid.add(FAMILY_WIN9X);
+ valid.add(FAMILY_ZOS);
+ valid.add(FAMILY_OS400);
+ valid.add(FAMILY_OPENVMS);
return valid;
}
/**
* Sets the desired OS family type
- *
+ *
* @param f The OS family type desired
* Possible values:
*
@@ -172,39 +167,35 @@ private static Set setValidFamilies()
* - openvms
*
*/
- public void setFamily( String f )
- {
- family = f.toLowerCase( Locale.US );
+ public void setFamily(String f) {
+ family = f.toLowerCase(Locale.US);
}
/**
* Sets the desired OS name
- *
+ *
* @param name The OS name
*/
- public void setName( String name )
- {
- this.name = name.toLowerCase( Locale.US );
+ public void setName(String name) {
+ this.name = name.toLowerCase(Locale.US);
}
/**
* Sets the desired OS architecture
- *
+ *
* @param arch The OS architecture
*/
- public void setArch( String arch )
- {
- this.arch = arch.toLowerCase( Locale.US );
+ public void setArch(String arch) {
+ this.arch = arch.toLowerCase(Locale.US);
}
/**
* Sets the desired OS version
- *
+ *
* @param version The OS version
*/
- public void setVersion( String version )
- {
- this.version = version.toLowerCase( Locale.US );
+ public void setVersion(String version) {
+ this.version = version.toLowerCase(Locale.US);
}
/**
@@ -213,64 +204,58 @@ public void setVersion( String version )
* @see Os#setFamily(String)
* @throws Exception any errir
*/
- public boolean eval()
- throws Exception
- {
- return isOs( family, name, arch, version );
+ public boolean eval() throws Exception {
+ return isOs(family, name, arch, version);
}
/**
* Determines if the current OS matches the given OS family.
- *
+ *
* @param family the family to check for
* @return true if the OS matches
* @since 1.0
*/
- public static boolean isFamily( String family )
- {
- return isOs( family, null, null, null );
+ public static boolean isFamily(String family) {
+ return isOs(family, null, null, null);
}
/**
* Determines if the current OS matches the given OS name.
- *
+ *
* @param name the OS name to check for
* @return true if the OS matches
* @since 1.0
*/
- public static boolean isName( String name )
- {
- return isOs( null, name, null, null );
+ public static boolean isName(String name) {
+ return isOs(null, name, null, null);
}
/**
* Determines if the current OS matches the given OS architecture.
- *
+ *
* @param arch the OS architecture to check for
* @return true if the OS matches
* @since 1.0
*/
- public static boolean isArch( String arch )
- {
- return isOs( null, null, arch, null );
+ public static boolean isArch(String arch) {
+ return isOs(null, null, arch, null);
}
/**
* Determines if the current OS matches the given OS version.
- *
+ *
* @param version the OS version to check for
* @return true if the OS matches
* @since 1.0
*/
- public static boolean isVersion( String version )
- {
- return isOs( null, null, null, version );
+ public static boolean isVersion(String version) {
+ return isOs(null, null, null, version);
}
/**
* Determines if the current OS matches the given OS family, name, architecture and version. The name, architecture
* and version are compared to the System properties os.name, os.version and os.arch in a case-independent way.
- *
+ *
* @param family The OS family
* @param name The OS name
* @param arch The OS architecture
@@ -278,84 +263,61 @@ public static boolean isVersion( String version )
* @return true if the OS matches
* @since 1.0
*/
- public static boolean isOs( String family, String name, String arch, String version )
- {
+ public static boolean isOs(String family, String name, String arch, String version) {
boolean retValue = false;
- if ( family != null || name != null || arch != null || version != null )
- {
+ if (family != null || name != null || arch != null || version != null) {
boolean isFamily = true;
boolean isName = true;
boolean isArch = true;
boolean isVersion = true;
- if ( family != null )
- {
- if ( family.equalsIgnoreCase( FAMILY_WINDOWS ) )
- {
- isFamily = OS_NAME.contains( FAMILY_WINDOWS );
- }
- else if ( family.equalsIgnoreCase( FAMILY_OS2 ) )
- {
- isFamily = OS_NAME.contains( FAMILY_OS2 );
- }
- else if ( family.equalsIgnoreCase( FAMILY_NETWARE ) )
- {
- isFamily = OS_NAME.contains( FAMILY_NETWARE );
- }
- else if ( family.equalsIgnoreCase( FAMILY_DOS ) )
- {
- isFamily = PATH_SEP.equals( ";" ) && !isFamily( FAMILY_NETWARE ) && !isFamily( FAMILY_WINDOWS )
- && !isFamily( FAMILY_WIN9X );
-
- }
- else if ( family.equalsIgnoreCase( FAMILY_MAC ) )
- {
- isFamily = OS_NAME.contains( FAMILY_MAC );
- }
- else if ( family.equalsIgnoreCase( FAMILY_TANDEM ) )
- {
- isFamily = OS_NAME.contains( "nonstop_kernel" );
- }
- else if ( family.equalsIgnoreCase( FAMILY_UNIX ) )
- {
- isFamily = PATH_SEP.equals( ":" ) && !isFamily( FAMILY_OPENVMS )
- && ( !isFamily( FAMILY_MAC ) || OS_NAME.endsWith( "x" ) );
- }
- else if ( family.equalsIgnoreCase( FAMILY_WIN9X ) )
- {
- isFamily = isFamily( FAMILY_WINDOWS ) && ( OS_NAME.contains( "95" ) || OS_NAME.contains( "98" )
- || OS_NAME.contains( "me" ) || OS_NAME.contains( "ce" ) );
- }
- else if ( family.equalsIgnoreCase( FAMILY_ZOS ) )
- {
- isFamily = OS_NAME.contains( FAMILY_ZOS ) || OS_NAME.contains( "os/390" );
- }
- else if ( family.equalsIgnoreCase( FAMILY_OS400 ) )
- {
- isFamily = OS_NAME.contains( FAMILY_OS400 );
- }
- else if ( family.equalsIgnoreCase( FAMILY_OPENVMS ) )
- {
- isFamily = OS_NAME.contains( FAMILY_OPENVMS );
- }
- else
- {
- isFamily = OS_NAME.contains( family.toLowerCase( Locale.US ) );
+ if (family != null) {
+ if (family.equalsIgnoreCase(FAMILY_WINDOWS)) {
+ isFamily = OS_NAME.contains(FAMILY_WINDOWS);
+ } else if (family.equalsIgnoreCase(FAMILY_OS2)) {
+ isFamily = OS_NAME.contains(FAMILY_OS2);
+ } else if (family.equalsIgnoreCase(FAMILY_NETWARE)) {
+ isFamily = OS_NAME.contains(FAMILY_NETWARE);
+ } else if (family.equalsIgnoreCase(FAMILY_DOS)) {
+ isFamily = PATH_SEP.equals(";")
+ && !isFamily(FAMILY_NETWARE)
+ && !isFamily(FAMILY_WINDOWS)
+ && !isFamily(FAMILY_WIN9X);
+
+ } else if (family.equalsIgnoreCase(FAMILY_MAC)) {
+ isFamily = OS_NAME.contains(FAMILY_MAC);
+ } else if (family.equalsIgnoreCase(FAMILY_TANDEM)) {
+ isFamily = OS_NAME.contains("nonstop_kernel");
+ } else if (family.equalsIgnoreCase(FAMILY_UNIX)) {
+ isFamily = PATH_SEP.equals(":")
+ && !isFamily(FAMILY_OPENVMS)
+ && (!isFamily(FAMILY_MAC) || OS_NAME.endsWith("x"));
+ } else if (family.equalsIgnoreCase(FAMILY_WIN9X)) {
+ isFamily = isFamily(FAMILY_WINDOWS)
+ && (OS_NAME.contains("95")
+ || OS_NAME.contains("98")
+ || OS_NAME.contains("me")
+ || OS_NAME.contains("ce"));
+ } else if (family.equalsIgnoreCase(FAMILY_ZOS)) {
+ isFamily = OS_NAME.contains(FAMILY_ZOS) || OS_NAME.contains("os/390");
+ } else if (family.equalsIgnoreCase(FAMILY_OS400)) {
+ isFamily = OS_NAME.contains(FAMILY_OS400);
+ } else if (family.equalsIgnoreCase(FAMILY_OPENVMS)) {
+ isFamily = OS_NAME.contains(FAMILY_OPENVMS);
+ } else {
+ isFamily = OS_NAME.contains(family.toLowerCase(Locale.US));
}
}
- if ( name != null )
- {
- isName = name.toLowerCase( Locale.US ).equals( OS_NAME );
+ if (name != null) {
+ isName = name.toLowerCase(Locale.US).equals(OS_NAME);
}
- if ( arch != null )
- {
- isArch = arch.toLowerCase( Locale.US ).equals( OS_ARCH );
+ if (arch != null) {
+ isArch = arch.toLowerCase(Locale.US).equals(OS_ARCH);
}
- if ( version != null )
- {
- isVersion = version.toLowerCase( Locale.US ).equals( OS_VERSION );
+ if (version != null) {
+ isVersion = version.toLowerCase(Locale.US).equals(OS_VERSION);
}
retValue = isFamily && isName && isArch && isVersion;
}
@@ -364,28 +326,22 @@ else if ( family.equalsIgnoreCase( FAMILY_OPENVMS ) )
/**
* Helper method to determine the current OS family.
- *
+ *
* @return name of current OS family.
* @since 1.4.2
*/
- private static String getOsFamily()
- {
+ private static String getOsFamily() {
// in case the order of static initialization is
// wrong, get the list
// safely.
Set families = null;
- if ( !validFamilies.isEmpty() )
- {
+ if (!validFamilies.isEmpty()) {
families = validFamilies;
- }
- else
- {
+ } else {
families = setValidFamilies();
}
- for ( String fam : families )
- {
- if ( Os.isFamily( fam ) )
- {
+ for (String fam : families) {
+ if (Os.isFamily(fam)) {
return fam;
}
}
@@ -407,22 +363,20 @@ private static String getOsFamily()
* - os/400
* - openvms
*
- *
+ *
* @param theFamily the family to check.
* @return true if one of the valid families.
* @since 1.4.2
*/
- public static boolean isValidFamily( String theFamily )
- {
- return ( validFamilies.contains( theFamily ) );
+ public static boolean isValidFamily(String theFamily) {
+ return (validFamilies.contains(theFamily));
}
/**
* @return a copy of the valid families
* @since 1.4.2
*/
- public static Set getValidFamilies()
- {
- return new HashSet( validFamilies );
+ public static Set getValidFamilies() {
+ return new HashSet(validFamilies);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/PathTool.java b/src/main/java/org/codehaus/plexus/util/PathTool.java
index b8392cdb..e6deab6b 100644
--- a/src/main/java/org/codehaus/plexus/util/PathTool.java
+++ b/src/main/java/org/codehaus/plexus/util/PathTool.java
@@ -27,17 +27,16 @@
* @author Vincent Siveton
*
*/
-public class PathTool
-{
+public class PathTool {
/**
* Determines the relative path of a filename from a base directory. This method is useful in building relative
* links within pages of a web site. It provides similar functionality to Anakia's $relativePath
* context variable. The arguments to this method may contain either forward or backward slashes as file separators.
* The relative path returned is formed using forward slashes as it is expected this path is to be used as a link in
* a web page (again mimicking Anakia's behavior).
- *
+ *
* This method is thread-safe.
- *
+ *
*
* PathTool.getRelativePath( null, null ) = ""
* PathTool.getRelativePath( null, "/usr/local/java/bin" ) = ""
@@ -53,17 +52,18 @@ public class PathTool
* slash. A zero-length string is returned if: the filename is not relative to the base directory,
* basedir is null or zero-length, or filename is null or zero-length.
*/
- public static final String getRelativePath( String basedir, String filename )
- {
- basedir = uppercaseDrive( basedir );
- filename = uppercaseDrive( filename );
+ public static final String getRelativePath(String basedir, String filename) {
+ basedir = uppercaseDrive(basedir);
+ filename = uppercaseDrive(filename);
/*
* Verify the arguments and make sure the filename is relative to the base directory.
*/
- if ( basedir == null || basedir.length() == 0 || filename == null || filename.length() == 0
- || !filename.startsWith( basedir ) )
- {
+ if (basedir == null
+ || basedir.length() == 0
+ || filename == null
+ || filename.length() == 0
+ || !filename.startsWith(basedir)) {
return "";
}
@@ -71,17 +71,17 @@ public static final String getRelativePath( String basedir, String filename )
* Normalize the arguments. First, determine the file separator that is being used, then strip that off the end
* of both the base directory and filename.
*/
- String separator = determineSeparator( filename );
- basedir = StringUtils.chompLast( basedir, separator );
- filename = StringUtils.chompLast( filename, separator );
+ String separator = determineSeparator(filename);
+ basedir = StringUtils.chompLast(basedir, separator);
+ filename = StringUtils.chompLast(filename, separator);
/*
* Remove the base directory from the filename to end up with a relative filename (relative to the base
* directory). This filename is then used to determine the relative path.
*/
- String relativeFilename = filename.substring( basedir.length() );
+ String relativeFilename = filename.substring(basedir.length());
- return determineRelativePath( relativeFilename, separator );
+ return determineRelativePath(relativeFilename, separator);
}
/**
@@ -90,7 +90,7 @@ public static final String getRelativePath( String basedir, String filename )
* to this method may contain either forward or backward slashes as file separators. The relative path returned is
* formed using forward slashes as it is expected this path is to be used as a link in a web page (again mimicking
* Anakia's behavior).
- *
+ *
* This method is thread-safe.
*
* @param filename The filename to be parsed.
@@ -98,12 +98,10 @@ public static final String getRelativePath( String basedir, String filename )
* string is returned if: filename is null or zero-length.
* @see #getRelativeFilePath(String, String)
*/
- public static final String getRelativePath( String filename )
- {
- filename = uppercaseDrive( filename );
+ public static final String getRelativePath(String filename) {
+ filename = uppercaseDrive(filename);
- if ( filename == null || filename.length() == 0 )
- {
+ if (filename == null || filename.length() == 0) {
return "";
}
@@ -112,23 +110,22 @@ public static final String getRelativePath( String filename )
* of the filename. Then, if the filename doesn't begin with a separator, add one.
*/
- String separator = determineSeparator( filename );
- filename = StringUtils.chompLast( filename, separator );
- if ( !filename.startsWith( separator ) )
- {
+ String separator = determineSeparator(filename);
+ filename = StringUtils.chompLast(filename, separator);
+ if (!filename.startsWith(separator)) {
filename = separator + filename;
}
- return determineRelativePath( filename, separator );
+ return determineRelativePath(filename, separator);
}
/**
* Determines the directory component of a filename. This is useful within DVSL templates when used in conjunction
* with the DVSL's $context.getAppValue("infilename") to get the current directory that is currently
* being processed.
- *
+ *
* This method is thread-safe.
- *
+ *
*
* PathTool.getDirectoryComponent( null ) = ""
* PathTool.getDirectoryComponent( "/usr/local/java/bin" ) = "/usr/local/java"
@@ -140,18 +137,15 @@ public static final String getRelativePath( String filename )
* @return The directory portion of the filename. If the filename does not contain a directory
* component, "." is returned.
*/
- public static final String getDirectoryComponent( String filename )
- {
- if ( filename == null || filename.length() == 0 )
- {
+ public static final String getDirectoryComponent(String filename) {
+ if (filename == null || filename.length() == 0) {
return "";
}
- String separator = determineSeparator( filename );
- String directory = StringUtils.chomp( filename, separator );
+ String separator = determineSeparator(filename);
+ String directory = StringUtils.chomp(filename, separator);
- if ( filename.equals( directory ) )
- {
+ if (filename.equals(directory)) {
return ".";
}
@@ -160,7 +154,7 @@ public static final String getDirectoryComponent( String filename )
/**
* Calculates the appropriate link given the preferred link and the relativePath of the document.
- *
+ *
*
* PathTool.calculateLink( "/index.html", "../.." ) = "../../index.html"
* PathTool.calculateLink( "http://plexus.codehaus.org/plexus-utils/index.html", "../.." ) = "http://plexus.codehaus.org/plexus-utils/index.html"
@@ -173,53 +167,43 @@ public static final String getDirectoryComponent( String filename )
* @param relativePath relative
* @return String
*/
- public static final String calculateLink( String link, String relativePath )
- {
- if ( link == null )
- {
+ public static final String calculateLink(String link, String relativePath) {
+ if (link == null) {
link = "";
}
- if ( relativePath == null )
- {
+ if (relativePath == null) {
relativePath = "";
}
// This must be some historical feature
- if ( link.startsWith( "/site/" ) )
- {
- return link.substring( 5 );
+ if (link.startsWith("/site/")) {
+ return link.substring(5);
}
// Allows absolute links in nav-bars etc
- if ( link.startsWith( "/absolute/" ) )
- {
- return link.substring( 10 );
+ if (link.startsWith("/absolute/")) {
+ return link.substring(10);
}
// This traps urls like http://
- if ( link.contains( ":" ) )
- {
+ if (link.contains(":")) {
return link;
}
// If relativepath is current directory, just pass the link through
- if ( StringUtils.equals( relativePath, "." ) )
- {
- if ( link.startsWith( "/" ) )
- {
- return link.substring( 1 );
+ if (StringUtils.equals(relativePath, ".")) {
+ if (link.startsWith("/")) {
+ return link.substring(1);
}
return link;
}
// If we don't do this, you can end up with ..//bob.html rather than ../bob.html
- if ( relativePath.endsWith( "/" ) && link.startsWith( "/" ) )
- {
- return relativePath + "." + link.substring( 1 );
+ if (relativePath.endsWith("/") && link.startsWith("/")) {
+ return relativePath + "." + link.substring(1);
}
- if ( relativePath.endsWith( "/" ) || link.startsWith( "/" ) )
- {
+ if (relativePath.endsWith("/") || link.startsWith("/")) {
return relativePath + link;
}
@@ -228,7 +212,7 @@ public static final String calculateLink( String link, String relativePath )
/**
* This method can calculate the relative path between two paths on a web site.
- *
+ *
*
* PathTool.getRelativeWebPath( null, null ) = ""
* PathTool.getRelativeWebPath( null, "http://plexus.codehaus.org/" ) = ""
@@ -243,17 +227,14 @@ public static final String calculateLink( String link, String relativePath )
* @param newPath second path
* @return a relative web path from oldPath.
*/
- public static final String getRelativeWebPath( final String oldPath, final String newPath )
- {
- if ( StringUtils.isEmpty( oldPath ) || StringUtils.isEmpty( newPath ) )
- {
+ public static final String getRelativeWebPath(final String oldPath, final String newPath) {
+ if (StringUtils.isEmpty(oldPath) || StringUtils.isEmpty(newPath)) {
return "";
}
- String resultPath = buildRelativePath( newPath, oldPath, '/' );
+ String resultPath = buildRelativePath(newPath, oldPath, '/');
- if ( newPath.endsWith( "/" ) && !resultPath.endsWith( "/" ) )
- {
+ if (newPath.endsWith("/") && !resultPath.endsWith("/")) {
return resultPath + "/";
}
@@ -262,7 +243,7 @@ public static final String getRelativeWebPath( final String oldPath, final Strin
/**
* This method can calculate the relative path between two paths on a file system.
- *
+ *
*
* PathTool.getRelativeFilePath( null, null ) = ""
* PathTool.getRelativeFilePath( null, "/usr/local/java/bin" ) = ""
@@ -275,66 +256,57 @@ public static final String getRelativeWebPath( final String oldPath, final Strin
* PathTool.getRelativeFilePath( "/usr/local/", "/bin" ) = "../../bin"
* PathTool.getRelativeFilePath( "/bin", "/usr/local/" ) = "../usr/local"
*
- *
+ *
* Note: On Windows based system, the / character should be replaced by \ character.
*
* @param oldPath main path
* @param newPath second path
* @return a relative file path from oldPath.
*/
- public static final String getRelativeFilePath( final String oldPath, final String newPath )
- {
- if ( StringUtils.isEmpty( oldPath ) || StringUtils.isEmpty( newPath ) )
- {
+ public static final String getRelativeFilePath(final String oldPath, final String newPath) {
+ if (StringUtils.isEmpty(oldPath) || StringUtils.isEmpty(newPath)) {
return "";
}
// normalise the path delimiters
- String fromPath = new File( oldPath ).getPath();
- String toPath = new File( newPath ).getPath();
+ String fromPath = new File(oldPath).getPath();
+ String toPath = new File(newPath).getPath();
// strip any leading slashes if its a windows path
- if ( toPath.matches( "^\\[a-zA-Z]:" ) )
- {
- toPath = toPath.substring( 1 );
+ if (toPath.matches("^\\[a-zA-Z]:")) {
+ toPath = toPath.substring(1);
}
- if ( fromPath.matches( "^\\[a-zA-Z]:" ) )
- {
- fromPath = fromPath.substring( 1 );
+ if (fromPath.matches("^\\[a-zA-Z]:")) {
+ fromPath = fromPath.substring(1);
}
// lowercase windows drive letters.
- if ( fromPath.startsWith( ":", 1 ) )
- {
- fromPath = Character.toLowerCase( fromPath.charAt( 0 ) ) + fromPath.substring( 1 );
+ if (fromPath.startsWith(":", 1)) {
+ fromPath = Character.toLowerCase(fromPath.charAt(0)) + fromPath.substring(1);
}
- if ( toPath.startsWith( ":", 1 ) )
- {
- toPath = Character.toLowerCase( toPath.charAt( 0 ) ) + toPath.substring( 1 );
+ if (toPath.startsWith(":", 1)) {
+ toPath = Character.toLowerCase(toPath.charAt(0)) + toPath.substring(1);
}
// check for the presence of windows drives. No relative way of
// traversing from one to the other.
- if ( ( toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) )
- && ( !toPath.substring( 0, 1 ).equals( fromPath.substring( 0, 1 ) ) ) )
- {
+ if ((toPath.startsWith(":", 1) && fromPath.startsWith(":", 1))
+ && (!toPath.substring(0, 1).equals(fromPath.substring(0, 1)))) {
// they both have drive path element but they dont match, no
// relative path
return null;
}
- if ( ( toPath.startsWith( ":", 1 ) && !fromPath.startsWith( ":", 1 ) )
- || ( !toPath.startsWith( ":", 1 ) && fromPath.startsWith( ":", 1 ) ) )
- {
+ if ((toPath.startsWith(":", 1) && !fromPath.startsWith(":", 1))
+ || (!toPath.startsWith(":", 1) && fromPath.startsWith(":", 1))) {
// one has a drive path element and the other doesnt, no relative
// path.
return null;
}
- String resultPath = buildRelativePath( toPath, fromPath, File.separatorChar );
+ String resultPath = buildRelativePath(toPath, fromPath, File.separatorChar);
- if ( newPath.endsWith( File.separator ) && !resultPath.endsWith( File.separator ) )
- {
+ if (newPath.endsWith(File.separator) && !resultPath.endsWith(File.separator)) {
return resultPath + File.separator;
}
@@ -354,10 +326,8 @@ public static final String getRelativeFilePath( final String oldPath, final Stri
* @return The relative path of the filename. This value is not terminated with a forward slash. A zero-length
* string is returned if: the filename is zero-length.
*/
- private static final String determineRelativePath( String filename, String separator )
- {
- if ( filename.length() == 0 )
- {
+ private static final String determineRelativePath(String filename, String separator) {
+ if (filename.length() == 0) {
return "";
}
@@ -365,9 +335,8 @@ private static final String determineRelativePath( String filename, String separ
* Count the slashes in the relative filename, but exclude the leading slash. If the path has no slashes, then
* the filename is relative to the current directory.
*/
- int slashCount = StringUtils.countMatches( filename, separator ) - 1;
- if ( slashCount <= 0 )
- {
+ int slashCount = StringUtils.countMatches(filename, separator) - 1;
+ if (slashCount <= 0) {
return ".";
}
@@ -376,15 +345,14 @@ private static final String determineRelativePath( String filename, String separ
* directories. Thus, each slash represents a "../" in the relative path.
*/
StringBuilder sb = new StringBuilder();
- for ( int i = 0; i < slashCount; i++ )
- {
- sb.append( "../" );
+ for (int i = 0; i < slashCount; i++) {
+ sb.append("../");
}
/*
* Finally, return the relative path but strip the trailing slash to mimic Anakia's behavior.
*/
- return StringUtils.chop( sb.toString() );
+ return StringUtils.chop(sb.toString());
}
/**
@@ -394,10 +362,9 @@ private static final String determineRelativePath( String filename, String separ
* @param filename The filename parsed to determine the file separator.
* @return The file separator used within filename. This value is either a forward or backward slash.
*/
- private static final String determineSeparator( String filename )
- {
- int forwardCount = StringUtils.countMatches( filename, "/" );
- int backwardCount = StringUtils.countMatches( filename, "\\" );
+ private static final String determineSeparator(String filename) {
+ int forwardCount = StringUtils.countMatches(filename, "/");
+ int backwardCount = StringUtils.countMatches(filename, "\\");
return forwardCount >= backwardCount ? "/" : "\\";
}
@@ -408,41 +375,31 @@ private static final String determineSeparator( String filename )
* @param path
* @return String
*/
- static final String uppercaseDrive( String path )
- {
- if ( path == null )
- {
+ static final String uppercaseDrive(String path) {
+ if (path == null) {
return null;
}
- if ( path.length() >= 2 && path.charAt( 1 ) == ':' )
- {
- path = Character.toUpperCase( path.charAt( 0 ) ) + path.substring( 1 );
+ if (path.length() >= 2 && path.charAt(1) == ':') {
+ path = Character.toUpperCase(path.charAt(0)) + path.substring(1);
}
return path;
}
- private static final String buildRelativePath( String toPath, String fromPath, final char separatorChar )
- {
+ private static final String buildRelativePath(String toPath, String fromPath, final char separatorChar) {
// use tokeniser to traverse paths and for lazy checking
- StringTokenizer toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
- StringTokenizer fromTokeniser = new StringTokenizer( fromPath, String.valueOf( separatorChar ) );
+ StringTokenizer toTokeniser = new StringTokenizer(toPath, String.valueOf(separatorChar));
+ StringTokenizer fromTokeniser = new StringTokenizer(fromPath, String.valueOf(separatorChar));
int count = 0;
// walk along the to path looking for divergence from the from path
- while ( toTokeniser.hasMoreTokens() && fromTokeniser.hasMoreTokens() )
- {
- if ( separatorChar == '\\' )
- {
- if ( !fromTokeniser.nextToken().equalsIgnoreCase( toTokeniser.nextToken() ) )
- {
+ while (toTokeniser.hasMoreTokens() && fromTokeniser.hasMoreTokens()) {
+ if (separatorChar == '\\') {
+ if (!fromTokeniser.nextToken().equalsIgnoreCase(toTokeniser.nextToken())) {
break;
}
- }
- else
- {
- if ( !fromTokeniser.nextToken().equals( toTokeniser.nextToken() ) )
- {
+ } else {
+ if (!fromTokeniser.nextToken().equals(toTokeniser.nextToken())) {
break;
}
}
@@ -453,11 +410,10 @@ private static final String buildRelativePath( String toPath, String fromPath, f
// reinitialise the tokenisers to count positions to retrieve the
// gobbled token
- toTokeniser = new StringTokenizer( toPath, String.valueOf( separatorChar ) );
- fromTokeniser = new StringTokenizer( fromPath, String.valueOf( separatorChar ) );
+ toTokeniser = new StringTokenizer(toPath, String.valueOf(separatorChar));
+ fromTokeniser = new StringTokenizer(fromPath, String.valueOf(separatorChar));
- while ( count-- > 0 )
- {
+ while (count-- > 0) {
fromTokeniser.nextToken();
toTokeniser.nextToken();
}
@@ -465,30 +421,25 @@ private static final String buildRelativePath( String toPath, String fromPath, f
String relativePath = "";
// add back refs for the rest of from location.
- while ( fromTokeniser.hasMoreTokens() )
- {
+ while (fromTokeniser.hasMoreTokens()) {
fromTokeniser.nextToken();
relativePath += "..";
- if ( fromTokeniser.hasMoreTokens() )
- {
+ if (fromTokeniser.hasMoreTokens()) {
relativePath += separatorChar;
}
}
- if ( relativePath.length() != 0 && toTokeniser.hasMoreTokens() )
- {
+ if (relativePath.length() != 0 && toTokeniser.hasMoreTokens()) {
relativePath += separatorChar;
}
// add fwd fills for whatevers left of newPath.
- while ( toTokeniser.hasMoreTokens() )
- {
+ while (toTokeniser.hasMoreTokens()) {
relativePath += toTokeniser.nextToken();
- if ( toTokeniser.hasMoreTokens() )
- {
+ if (toTokeniser.hasMoreTokens()) {
relativePath += separatorChar;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
index cee5cd25..848ac158 100644
--- a/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/PropertyUtils.java
@@ -1,7 +1,5 @@
package org.codehaus.plexus.util;
-import java.util.Objects;
-
/*
* Copyright The Codehaus Foundation.
*
@@ -18,12 +16,13 @@
* limitations under the License.
*/
-import java.util.Properties;
import java.io.File;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.nio.file.Files;
+import java.util.Objects;
+import java.util.Properties;
/**
* Static methods to create Properties loaded from various sources.
@@ -31,36 +30,27 @@
* @author Jason van Zyl
* @author Michal Maczka
*/
-public class PropertyUtils
-{
+public class PropertyUtils {
- public static Properties loadProperties( final URL url )
- throws IOException
- {
- return loadProperties( Objects.requireNonNull( url, "url" ).openStream() );
+ public static Properties loadProperties(final URL url) throws IOException {
+ return loadProperties(Objects.requireNonNull(url, "url").openStream());
}
- public static Properties loadProperties( final File file )
- throws IOException
- {
- return loadProperties( Files.newInputStream( Objects.requireNonNull( file, "file" ).toPath() ) );
+ public static Properties loadProperties(final File file) throws IOException {
+ return loadProperties(
+ Files.newInputStream(Objects.requireNonNull(file, "file").toPath()));
}
- public static Properties loadProperties( final InputStream is )
- throws IOException
- {
+ public static Properties loadProperties(final InputStream is) throws IOException {
final Properties properties = new Properties();
-
+
// Make sure the properties stream is valid
- if ( is != null )
- {
- try ( InputStream in = is )
- {
- properties.load( in );
+ if (is != null) {
+ try (InputStream in = is) {
+ properties.load(in);
}
}
return properties;
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
index a469a2c7..06d7a2d5 100644
--- a/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
+++ b/src/main/java/org/codehaus/plexus/util/ReaderFactory.java
@@ -17,7 +17,6 @@
*/
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -32,18 +31,23 @@
/**
* Utility to create Readers from streams, with explicit encoding choice: platform default, XML, or specified.
*
+ * @deprecated This class has been deprecated. When reading XML, users are encouraged to pass the {@code InputStream}
+ * directory to the {@link org.codehaus.plexus.util.xml.pull.MXParser#setInput(InputStream, String)},
+ * giving a {@code null} encoding to let the parser figure it out. For non xml usages, use the JDK
+ * {@link Files} utility methods.
+ *
* @author Herve Boutemy
* @see Charset
* @see Supported encodings
*
* @since 1.4.3
*/
-public class ReaderFactory
-{
+@Deprecated
+public class ReaderFactory {
/**
* ISO Latin Alphabet #1, also known as ISO-LATIN-1. Every implementation of the Java platform is required to
* support this character encoding.
- *
+ *
* @see Charset
*/
public static final String ISO_8859_1 = "ISO-8859-1";
@@ -51,7 +55,7 @@ public class ReaderFactory
/**
* Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set. Every
* implementation of the Java platform is required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String US_ASCII = "US-ASCII";
@@ -60,7 +64,7 @@ public class ReaderFactory
* Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either
* order accepted on input, big-endian used on output). Every implementation of the Java platform is required to
* support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16 = "UTF-16";
@@ -68,7 +72,7 @@ public class ReaderFactory
/**
* Sixteen-bit Unicode Transformation Format, big-endian byte order. Every implementation of the Java platform is
* required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16BE = "UTF-16BE";
@@ -76,7 +80,7 @@ public class ReaderFactory
/**
* Sixteen-bit Unicode Transformation Format, little-endian byte order. Every implementation of the Java platform is
* required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16LE = "UTF-16LE";
@@ -84,7 +88,7 @@ public class ReaderFactory
/**
* Eight-bit Unicode Transformation Format. Every implementation of the Java platform is required to support this
* character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_8 = "UTF-8";
@@ -92,7 +96,7 @@ public class ReaderFactory
/**
* The file.encoding System Property.
*/
- public static final String FILE_ENCODING = System.getProperty( "file.encoding" );
+ public static final String FILE_ENCODING = System.getProperty("file.encoding");
/**
* Create a new Reader with XML encoding detection rules.
@@ -102,10 +106,8 @@ public class ReaderFactory
* @throws IOException if any.
* @see XmlStreamReader
*/
- public static XmlStreamReader newXmlReader( InputStream in )
- throws IOException
- {
- return new XmlStreamReader( in );
+ public static XmlStreamReader newXmlReader(InputStream in) throws IOException {
+ return new XmlStreamReader(in);
}
/**
@@ -116,10 +118,8 @@ public static XmlStreamReader newXmlReader( InputStream in )
* @throws IOException if any.
* @see XmlStreamReader
*/
- public static XmlStreamReader newXmlReader( File file )
- throws IOException
- {
- return new XmlStreamReader( file );
+ public static XmlStreamReader newXmlReader(File file) throws IOException {
+ return new XmlStreamReader(file);
}
/**
@@ -130,10 +130,8 @@ public static XmlStreamReader newXmlReader( File file )
* @throws IOException if any.
* @see XmlStreamReader
*/
- public static XmlStreamReader newXmlReader( URL url )
- throws IOException
- {
- return new XmlStreamReader( url );
+ public static XmlStreamReader newXmlReader(URL url) throws IOException {
+ return new XmlStreamReader(url);
}
/**
@@ -143,9 +141,8 @@ public static XmlStreamReader newXmlReader( URL url )
* @return a reader instance for the input stream using the default platform charset.
* @see Charset#defaultCharset()
*/
- public static Reader newPlatformReader( InputStream in )
- {
- return new InputStreamReader( in );
+ public static Reader newPlatformReader(InputStream in) {
+ return new InputStreamReader(in);
}
/**
@@ -156,10 +153,8 @@ public static Reader newPlatformReader( InputStream in )
* @throws IOException if any.
* @see Charset#defaultCharset()
*/
- public static Reader newPlatformReader( File file )
- throws IOException
- {
- return Files.newBufferedReader( file.toPath() );
+ public static Reader newPlatformReader(File file) throws IOException {
+ return Files.newBufferedReader(file.toPath());
}
/**
@@ -170,10 +165,8 @@ public static Reader newPlatformReader( File file )
* @throws IOException if any.
* @see Charset#defaultCharset()
*/
- public static Reader newPlatformReader( URL url )
- throws IOException
- {
- return new InputStreamReader( url.openStream() );
+ public static Reader newPlatformReader(URL url) throws IOException {
+ return new InputStreamReader(url.openStream());
}
/**
@@ -185,10 +178,8 @@ public static Reader newPlatformReader( URL url )
* @throws UnsupportedEncodingException if any.
* @see Supported encodings
*/
- public static Reader newReader( InputStream in, String encoding )
- throws UnsupportedEncodingException
- {
- return new InputStreamReader( in, encoding );
+ public static Reader newReader(InputStream in, String encoding) throws UnsupportedEncodingException {
+ return new InputStreamReader(in, encoding);
}
/**
@@ -201,10 +192,8 @@ public static Reader newReader( InputStream in, String encoding )
* @throws IOException if any.
* @see Supported encodings
*/
- public static Reader newReader( File file, String encoding )
- throws IOException
- {
- return new InputStreamReader( Files.newInputStream( file.toPath() ), encoding );
+ public static Reader newReader(File file, String encoding) throws IOException {
+ return new InputStreamReader(Files.newInputStream(file.toPath()), encoding);
}
/**
@@ -216,9 +205,7 @@ public static Reader newReader( File file, String encoding )
* @throws IOException if any.
* @see Supported encodings
*/
- public static Reader newReader( URL url, String encoding )
- throws IOException
- {
- return new InputStreamReader( url.openStream(), encoding );
+ public static Reader newReader(URL url, String encoding) throws IOException {
+ return new InputStreamReader(url.openStream(), encoding);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
index 3ebf3b2d..a0d3af64 100644
--- a/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/ReflectionUtils.java
@@ -16,59 +16,51 @@
* limitations under the License.
*/
+import java.lang.reflect.AccessibleObject;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.AccessibleObject;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* Operations on a class' fields and their setters.
- *
+ *
* @author Michal Maczka
* @author Jesse McConnell
* @author Trygve Laugstøl
*/
-public final class ReflectionUtils
-{
+public final class ReflectionUtils {
// ----------------------------------------------------------------------
// Field utils
// ----------------------------------------------------------------------
- public static Field getFieldByNameIncludingSuperclasses( String fieldName, Class clazz )
- {
+ public static Field getFieldByNameIncludingSuperclasses(String fieldName, Class clazz) {
Field retValue = null;
- try
- {
- retValue = clazz.getDeclaredField( fieldName );
- }
- catch ( NoSuchFieldException e )
- {
+ try {
+ retValue = clazz.getDeclaredField(fieldName);
+ } catch (NoSuchFieldException e) {
Class superclass = clazz.getSuperclass();
- if ( superclass != null )
- {
- retValue = getFieldByNameIncludingSuperclasses( fieldName, superclass );
+ if (superclass != null) {
+ retValue = getFieldByNameIncludingSuperclasses(fieldName, superclass);
}
}
return retValue;
}
- public static List getFieldsIncludingSuperclasses( Class clazz )
- {
- List fields = new ArrayList<>( Arrays.asList( clazz.getDeclaredFields() ) );
+ public static List getFieldsIncludingSuperclasses(Class clazz) {
+ List fields = new ArrayList<>(Arrays.asList(clazz.getDeclaredFields()));
Class superclass = clazz.getSuperclass();
- if ( superclass != null )
- {
- fields.addAll( getFieldsIncludingSuperclasses( superclass ) );
+ if (superclass != null) {
+ fields.addAll(getFieldsIncludingSuperclasses(superclass));
}
return fields;
@@ -85,16 +77,13 @@ public static List getFieldsIncludingSuperclasses( Class clazz )
* @param clazz The class to find the method in.
* @return null or the method found.
*/
- public static Method getSetter( String fieldName, Class clazz )
- {
+ public static Method getSetter(String fieldName, Class clazz) {
Method[] methods = clazz.getMethods();
- fieldName = "set" + StringUtils.capitalizeFirstLetter( fieldName );
+ fieldName = "set" + StringUtils.capitalizeFirstLetter(fieldName);
- for ( Method method : methods )
- {
- if ( method.getName().equals( fieldName ) && isSetter( method ) )
- {
+ for (Method method : methods) {
+ if (method.getName().equals(fieldName) && isSetter(method)) {
return method;
}
}
@@ -106,17 +95,14 @@ public static Method getSetter( String fieldName, Class clazz )
* @return all setters in the given class and super classes.
* @param clazz the Class
*/
- public static List getSetters( Class clazz )
- {
+ public static List getSetters(Class clazz) {
Method[] methods = clazz.getMethods();
List list = new ArrayList<>();
- for ( Method method : methods )
- {
- if ( isSetter( method ) )
- {
- list.add( method );
+ for (Method method : methods) {
+ if (isSetter(method)) {
+ list.add(method);
}
}
@@ -127,12 +113,10 @@ public static List getSetters( Class clazz )
* @param method the method
* @return the class of the argument to the setter. Will throw an RuntimeException if the method isn't a setter.
*/
- public static Class getSetterType( Method method )
- {
- if ( !isSetter( method ) )
- {
- throw new RuntimeException( "The method " + method.getDeclaringClass().getName() + "." + method.getName()
- + " is not a setter." );
+ public static Class getSetterType(Method method) {
+ if (!isSetter(method)) {
+ throw new RuntimeException("The method "
+ + method.getDeclaringClass().getName() + "." + method.getName() + " is not a setter.");
}
return method.getParameterTypes()[0];
@@ -150,33 +134,30 @@ public static Class getSetterType( Method method )
* @param value see name
* @throws IllegalAccessException if error
*/
- public static void setVariableValueInObject( Object object, String variable, Object value )
- throws IllegalAccessException
- {
- Field field = getFieldByNameIncludingSuperclasses( variable, object.getClass() );
+ public static void setVariableValueInObject(Object object, String variable, Object value)
+ throws IllegalAccessException {
+ Field field = getFieldByNameIncludingSuperclasses(variable, object.getClass());
- field.setAccessible( true );
+ field.setAccessible(true);
- field.set( object, value );
+ field.set(object, value);
}
/**
* Generates a map of the fields and values on a given object, also pulls from superclasses
- *
+ *
* @param variable field name
* @param object the object to generate the list of fields from
* @return map containing the fields and their values
* @throws IllegalAccessException cannot access
*/
- public static Object getValueIncludingSuperclasses( String variable, Object object )
- throws IllegalAccessException
- {
+ public static Object getValueIncludingSuperclasses(String variable, Object object) throws IllegalAccessException {
- Field field = getFieldByNameIncludingSuperclasses( variable, object.getClass() );
+ Field field = getFieldByNameIncludingSuperclasses(variable, object.getClass());
- field.setAccessible( true );
+ field.setAccessible(true);
- return field.get( object );
+ return field.get(object);
}
/**
@@ -186,12 +167,11 @@ public static Object getValueIncludingSuperclasses( String variable, Object obje
* @return map containing the fields and their values
* @throws IllegalAccessException cannot access
*/
- public static Map getVariablesAndValuesIncludingSuperclasses( Object object )
- throws IllegalAccessException
- {
+ public static Map getVariablesAndValuesIncludingSuperclasses(Object object)
+ throws IllegalAccessException {
Map map = new HashMap<>();
- gatherVariablesAndValuesIncludingSuperclasses( object, map );
+ gatherVariablesAndValuesIncludingSuperclasses(object, map);
return map;
}
@@ -200,10 +180,11 @@ public static Map getVariablesAndValuesIncludingSuperclasses( Ob
// Private
// ----------------------------------------------------------------------
- public static boolean isSetter( Method method )
- {
- return method.getReturnType().equals( Void.TYPE ) && // FIXME: needed /required?
- !Modifier.isStatic( method.getModifiers() ) && method.getParameterTypes().length == 1;
+ public static boolean isSetter(Method method) {
+ return method.getReturnType().equals(Void.TYPE)
+ && // FIXME: needed /required?
+ !Modifier.isStatic(method.getModifiers())
+ && method.getParameterTypes().length == 1;
}
/**
@@ -212,15 +193,13 @@ public static boolean isSetter( Method method )
* @param object the object to generate the list of fields from
* @param map to populate
*/
- private static void gatherVariablesAndValuesIncludingSuperclasses( Object object, Map map )
- throws IllegalAccessException
- {
+ private static void gatherVariablesAndValuesIncludingSuperclasses(Object object, Map map)
+ throws IllegalAccessException {
Class clazz = object.getClass();
- if ( Float.parseFloat( System.getProperty( "java.specification.version" ) ) >= 11
- && Class.class.getCanonicalName().equals( clazz.getCanonicalName() ) )
- {
+ if (Float.parseFloat(System.getProperty("java.specification.version")) >= 11
+ && Class.class.getCanonicalName().equals(clazz.getCanonicalName())) {
// Updating Class fields accessibility is forbidden on Java 16 (and throws warning from version 11)
// No concrete use case to modify accessibility at this level
return;
@@ -228,19 +207,16 @@ private static void gatherVariablesAndValuesIncludingSuperclasses( Object object
Field[] fields = clazz.getDeclaredFields();
- AccessibleObject.setAccessible( fields, true );
-
- for ( Field field : fields )
- {
- map.put( field.getName(), field.get( object ) );
+ AccessibleObject.setAccessible(fields, true);
+ for (Field field : fields) {
+ map.put(field.getName(), field.get(object));
}
Class superclass = clazz.getSuperclass();
- if ( !Object.class.equals( superclass ) )
- {
- gatherVariablesAndValuesIncludingSuperclasses( superclass, map );
+ if (!Object.class.equals(superclass)) {
+ gatherVariablesAndValuesIncludingSuperclasses(superclass, map);
}
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/Scanner.java b/src/main/java/org/codehaus/plexus/util/Scanner.java
index 20bf85fb..4d1701c1 100644
--- a/src/main/java/org/codehaus/plexus/util/Scanner.java
+++ b/src/main/java/org/codehaus/plexus/util/Scanner.java
@@ -22,8 +22,7 @@
/**
* Scan a directory tree for files, with specified inclusions and exclusions.
*/
-public interface Scanner
-{
+public interface Scanner {
/**
* Sets the list of include patterns to use. All '/' and '\' characters are replaced by
@@ -34,7 +33,7 @@ public interface Scanner
* @param includes A list of include patterns. May be null, indicating that all files should be
* included. If a non-null list is given, all elements must be non-null.
*/
- void setIncludes( String[] includes );
+ void setIncludes(String[] includes);
/**
* Sets the list of exclude patterns to use. All '/' and '\' characters are replaced by
@@ -45,7 +44,7 @@ public interface Scanner
* @param excludes A list of exclude patterns. May be null, indicating that no files should be
* excluded. If a non-null list is given, all elements must be non-null.
*/
- void setExcludes( String[] excludes );
+ void setExcludes(String[] excludes);
/**
* Adds default exclusions to the current exclusions set.
@@ -91,5 +90,5 @@ public interface Scanner
* @param filenameComparator the Comparator instance to use
* @since 3.3.0
*/
- void setFilenameComparator( Comparator filenameComparator );
+ void setFilenameComparator(Comparator filenameComparator);
}
diff --git a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
index 234a92c5..571bc002 100644
--- a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java
@@ -63,7 +63,7 @@
* This is a utility class used by selectors and DirectoryScanner. The functionality more properly belongs just to
* selectors, but unfortunately DirectoryScanner exposed these as protected methods. Thus we have to support any
* subclasses of DirectoryScanner that may access these methods.
- *
+ *
* This is a Singleton.
*
* @author Arnout J. Kuiper ajkuiper@wxs.nl
@@ -72,8 +72,7 @@
*
* @since 1.5
*/
-public final class SelectorUtils
-{
+public final class SelectorUtils {
public static final String PATTERN_HANDLER_PREFIX = "[";
@@ -88,21 +87,18 @@ public final class SelectorUtils
/**
* Private Constructor
*/
- private SelectorUtils()
- {
- }
+ private SelectorUtils() {}
/**
* @return Retrieves the manager of the Singleton.
*/
- public static SelectorUtils getInstance()
- {
+ public static SelectorUtils getInstance() {
return instance;
}
/**
* Tests whether or not a given path matches the start of a given pattern up to the first "**".
- *
+ *
* This is not a general purpose test and should only be used if you can live with false positives. For example,
* pattern=**\a and str=b will yield true.
*
@@ -110,14 +106,13 @@ public static SelectorUtils getInstance()
* @param str The path to match, as a String. Must not be null.
* @return whether or not a given path matches the start of a given pattern up to the first "**".
*/
- public static boolean matchPatternStart( String pattern, String str )
- {
- return matchPatternStart( pattern, str, true );
+ public static boolean matchPatternStart(String pattern, String str) {
+ return matchPatternStart(pattern, str, true);
}
/**
* Tests whether or not a given path matches the start of a given pattern up to the first "**".
- *
+ *
* This is not a general purpose test and should only be used if you can live with false positives. For example,
* pattern=**\a and str=b will yield true.
*
@@ -126,79 +121,67 @@ public static boolean matchPatternStart( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return whether or not a given path matches the start of a given pattern up to the first "**".
*/
- public static boolean matchPatternStart( String pattern, String str, boolean isCaseSensitive )
- {
- if ( isRegexPrefixedPattern( pattern ) )
- {
+ public static boolean matchPatternStart(String pattern, String str, boolean isCaseSensitive) {
+ if (isRegexPrefixedPattern(pattern)) {
// FIXME: ICK! But we can't do partial matches for regex, so we have to reserve judgement until we have
// a file to deal with, or we can definitely say this is an exclusion...
return true;
- }
- else
- {
- if ( isAntPrefixedPattern( pattern ) )
- {
- pattern = pattern.substring( ANT_HANDLER_PREFIX.length(),
- pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+ } else {
+ if (isAntPrefixedPattern(pattern)) {
+ pattern = pattern.substring(
+ ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length());
}
- String altStr = str.replace( '\\', '/' );
+ String altStr = str.replace('\\', '/');
- return matchAntPathPatternStart( pattern, str, File.separator, isCaseSensitive )
- || matchAntPathPatternStart( pattern, altStr, "/", isCaseSensitive );
+ return matchAntPathPatternStart(pattern, str, File.separator, isCaseSensitive)
+ || matchAntPathPatternStart(pattern, altStr, "/", isCaseSensitive);
}
}
- static boolean isAntPrefixedPattern( String pattern )
- {
- return pattern.length() > ( ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( ANT_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
+ public static boolean isAntPrefixedPattern(String pattern) {
+ return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
+ && pattern.startsWith(ANT_HANDLER_PREFIX)
+ && pattern.endsWith(PATTERN_HANDLER_SUFFIX);
}
- @SuppressWarnings( "SimplifiableIfStatement" )
- static boolean matchAntPathPatternStart( MatchPattern pattern, String str, String separator,
- boolean isCaseSensitive )
- {
- if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
- {
+ @SuppressWarnings("SimplifiableIfStatement")
+ static boolean matchAntPathPatternStart(
+ MatchPattern pattern, String str, String separator, boolean isCaseSensitive) {
+ if (separatorPatternStartSlashMismatch(pattern, str, separator)) {
return false;
}
- return matchAntPathPatternStart( pattern.getTokenizedPathString(), str, separator, isCaseSensitive );
+ return matchAntPathPatternStart(pattern.getTokenizedPathString(), str, separator, isCaseSensitive);
}
- static boolean matchAntPathPatternStart( String pattern, String str, String separator, boolean isCaseSensitive )
- {
+ static boolean matchAntPathPatternStart(String pattern, String str, String separator, boolean isCaseSensitive) {
// When str starts with a File.separator, pattern has to start with a
// File.separator.
// When pattern starts with a File.separator, str has to start with a
// File.separator.
- if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
- {
+ if (separatorPatternStartSlashMismatch(pattern, str, separator)) {
return false;
}
- String[] patDirs = tokenizePathToString( pattern, separator );
- return matchAntPathPatternStart( patDirs, str, separator, isCaseSensitive );
+ String[] patDirs = tokenizePathToString(pattern, separator);
+ return matchAntPathPatternStart(patDirs, str, separator, isCaseSensitive);
}
// When str starts with a File.separator, pattern has to start with a
// File.separator.
// When pattern starts with a File.separator, str has to start with a
// File.separator.
- private static boolean separatorPatternStartSlashMismatch( String pattern, String str, String separator )
- {
- return str.startsWith( separator ) != pattern.startsWith( separator );
+ private static boolean separatorPatternStartSlashMismatch(String pattern, String str, String separator) {
+ return str.startsWith(separator) != pattern.startsWith(separator);
}
- private static boolean separatorPatternStartSlashMismatch( MatchPattern matchPattern, String str, String separator )
- {
- return str.startsWith( separator ) != matchPattern.startsWith( separator );
+ private static boolean separatorPatternStartSlashMismatch(MatchPattern matchPattern, String str, String separator) {
+ return str.startsWith(separator) != matchPattern.startsWith(separator);
}
- static boolean matchAntPathPatternStart( String[] patDirs, String str, String separator, boolean isCaseSensitive )
- {
- String[] strDirs = tokenizePathToString( str, separator );
+ static boolean matchAntPathPatternStart(String[] patDirs, String str, String separator, boolean isCaseSensitive) {
+ String[] strDirs = tokenizePathToString(str, separator);
int patIdxStart = 0;
int patIdxEnd = patDirs.length - 1;
@@ -206,15 +189,12 @@ static boolean matchAntPathPatternStart( String[] patDirs, String str, String se
int strIdxEnd = strDirs.length - 1;
// up to first '**'
- while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd) {
String patDir = patDirs[patIdxStart];
- if ( patDir.equals( "**" ) )
- {
+ if (patDir.equals("**")) {
break;
}
- if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
- {
+ if (!match(patDir, strDirs[strIdxStart], isCaseSensitive)) {
return false;
}
patIdxStart++;
@@ -231,9 +211,8 @@ static boolean matchAntPathPatternStart( String[] patDirs, String str, String se
* @param str The path to match, as a String. Must not be null.
* @return true if the pattern matches against the string, or false otherwise.
*/
- public static boolean matchPath( String pattern, String str )
- {
- return matchPath( pattern, str, true );
+ public static boolean matchPath(String pattern, String str) {
+ return matchPath(pattern, str, true);
}
/**
@@ -244,174 +223,140 @@ public static boolean matchPath( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return true if the pattern matches against the string, or false otherwise.
*/
- public static boolean matchPath( String pattern, String str, boolean isCaseSensitive )
- {
- return matchPath( pattern, str, File.separator, isCaseSensitive );
+ public static boolean matchPath(String pattern, String str, boolean isCaseSensitive) {
+ return matchPath(pattern, str, File.separator, isCaseSensitive);
}
- public static boolean matchPath( String pattern, String str, String separator, boolean isCaseSensitive )
- {
- if ( isRegexPrefixedPattern( pattern ) )
- {
- String localPattern =
- pattern.substring( REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() );
+ public static boolean matchPath(String pattern, String str, String separator, boolean isCaseSensitive) {
+ if (isRegexPrefixedPattern(pattern)) {
+ String localPattern = pattern.substring(
+ REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length());
- return str.matches( localPattern );
- }
- else
- {
- String localPattern = isAntPrefixedPattern( pattern )
- ? pattern.substring( ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length() )
- : pattern;
- final String osRelatedPath = toOSRelatedPath( str, separator );
- final String osRelatedPattern = toOSRelatedPath( localPattern, separator );
- return matchAntPathPattern( osRelatedPattern, osRelatedPath, separator, isCaseSensitive );
+ return str.matches(localPattern);
+ } else {
+ String localPattern = isAntPrefixedPattern(pattern)
+ ? pattern.substring(ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length())
+ : pattern;
+ final String osRelatedPath = toOSRelatedPath(str, separator);
+ final String osRelatedPattern = toOSRelatedPath(localPattern, separator);
+ return matchAntPathPattern(osRelatedPattern, osRelatedPath, separator, isCaseSensitive);
}
}
- private static String toOSRelatedPath( String pattern, String separator )
- {
- if ( "/".equals( separator ) )
- {
- return pattern.replace( "\\", separator );
+ private static String toOSRelatedPath(String pattern, String separator) {
+ if ("/".equals(separator)) {
+ return pattern.replace("\\", separator);
}
- if ( "\\".equals( separator ) ) {
- return pattern.replace( "/", separator );
+ if ("\\".equals(separator)) {
+ return pattern.replace("/", separator);
}
return pattern;
}
- static boolean isRegexPrefixedPattern( String pattern )
- {
- return pattern.length() > ( REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1 )
- && pattern.startsWith( REGEX_HANDLER_PREFIX ) && pattern.endsWith( PATTERN_HANDLER_SUFFIX );
+ public static boolean isRegexPrefixedPattern(String pattern) {
+ return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length())
+ && pattern.startsWith(REGEX_HANDLER_PREFIX)
+ && pattern.endsWith(PATTERN_HANDLER_SUFFIX);
}
- static boolean matchAntPathPattern( MatchPattern matchPattern, String str, String separator,
- boolean isCaseSensitive )
- {
- if ( separatorPatternStartSlashMismatch( matchPattern, str, separator ) )
- {
+ static boolean matchAntPathPattern(
+ MatchPattern matchPattern, String str, String separator, boolean isCaseSensitive) {
+ if (separatorPatternStartSlashMismatch(matchPattern, str, separator)) {
return false;
}
String[] patDirs = matchPattern.getTokenizedPathString();
- String[] strDirs = tokenizePathToString( str, separator );
- return matchAntPathPattern( patDirs, strDirs, isCaseSensitive );
+ String[] strDirs = tokenizePathToString(str, separator);
+ return matchAntPathPattern(patDirs, strDirs, isCaseSensitive);
}
- static boolean matchAntPathPattern( String pattern, String str, String separator, boolean isCaseSensitive )
- {
- if ( separatorPatternStartSlashMismatch( pattern, str, separator ) )
- {
+ static boolean matchAntPathPattern(String pattern, String str, String separator, boolean isCaseSensitive) {
+ if (separatorPatternStartSlashMismatch(pattern, str, separator)) {
return false;
}
- String[] patDirs = tokenizePathToString( pattern, separator );
- String[] strDirs = tokenizePathToString( str, separator );
- return matchAntPathPattern( patDirs, strDirs, isCaseSensitive );
-
+ String[] patDirs = tokenizePathToString(pattern, separator);
+ String[] strDirs = tokenizePathToString(str, separator);
+ return matchAntPathPattern(patDirs, strDirs, isCaseSensitive);
}
- static boolean matchAntPathPattern( String[] patDirs, String[] strDirs, boolean isCaseSensitive )
- {
+ static boolean matchAntPathPattern(String[] patDirs, String[] strDirs, boolean isCaseSensitive) {
int patIdxStart = 0;
int patIdxEnd = patDirs.length - 1;
int strIdxStart = 0;
int strIdxEnd = strDirs.length - 1;
// up to first '**'
- while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd) {
String patDir = patDirs[patIdxStart];
- if ( patDir.equals( "**" ) )
- {
+ if (patDir.equals("**")) {
break;
}
- if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
- {
+ if (!match(patDir, strDirs[strIdxStart], isCaseSensitive)) {
return false;
}
patIdxStart++;
strIdxStart++;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// String is exhausted
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !patDirs[i].equals( "**" ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!patDirs[i].equals("**")) {
return false;
}
}
return true;
- }
- else
- {
- if ( patIdxStart > patIdxEnd )
- {
+ } else {
+ if (patIdxStart > patIdxEnd) {
// String not exhausted, but pattern is. Failure.
return false;
}
}
// up to last '**'
- while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd) {
String patDir = patDirs[patIdxEnd];
- if ( patDir.equals( "**" ) )
- {
+ if (patDir.equals("**")) {
break;
}
- if ( !match( patDir, strDirs[strIdxEnd], isCaseSensitive ) )
- {
+ if (!match(patDir, strDirs[strIdxEnd], isCaseSensitive)) {
return false;
}
patIdxEnd--;
strIdxEnd--;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// String is exhausted
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !patDirs[i].equals( "**" ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!patDirs[i].equals("**")) {
return false;
}
}
return true;
}
- while ( patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
int patIdxTmp = -1;
- for ( int i = patIdxStart + 1; i <= patIdxEnd; i++ )
- {
- if ( patDirs[i].equals( "**" ) )
- {
+ for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
+ if (patDirs[i].equals("**")) {
patIdxTmp = i;
break;
}
}
- if ( patIdxTmp == patIdxStart + 1 )
- {
+ if (patIdxTmp == patIdxStart + 1) {
// '**/**' situation, so skip one
patIdxStart++;
continue;
}
// Find the pattern between padIdxStart & padIdxTmp in str between
// strIdxStart & strIdxEnd
- int patLength = ( patIdxTmp - patIdxStart - 1 );
- int strLength = ( strIdxEnd - strIdxStart + 1 );
+ int patLength = (patIdxTmp - patIdxStart - 1);
+ int strLength = (strIdxEnd - strIdxStart + 1);
int foundIdx = -1;
- strLoop: for ( int i = 0; i <= strLength - patLength; i++ )
- {
- for ( int j = 0; j < patLength; j++ )
- {
+ strLoop:
+ for (int i = 0; i <= strLength - patLength; i++) {
+ for (int j = 0; j < patLength; j++) {
String subPat = patDirs[patIdxStart + j + 1];
String subStr = strDirs[strIdxStart + i + j];
- if ( !match( subPat, subStr, isCaseSensitive ) )
- {
+ if (!match(subPat, subStr, isCaseSensitive)) {
continue strLoop;
}
}
@@ -420,8 +365,7 @@ static boolean matchAntPathPattern( String[] patDirs, String[] strDirs, boolean
break;
}
- if ( foundIdx == -1 )
- {
+ if (foundIdx == -1) {
return false;
}
@@ -429,10 +373,8 @@ static boolean matchAntPathPattern( String[] patDirs, String[] strDirs, boolean
strIdxStart = foundIdx + patLength;
}
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !patDirs[i].equals( "**" ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!patDirs[i].equals("**")) {
return false;
}
}
@@ -440,107 +382,85 @@ static boolean matchAntPathPattern( String[] patDirs, String[] strDirs, boolean
return true;
}
- static boolean matchAntPathPattern( char[][] patDirs, char[][] strDirs, boolean isCaseSensitive )
- {
+ static boolean matchAntPathPattern(char[][] patDirs, char[][] strDirs, boolean isCaseSensitive) {
int patIdxStart = 0;
int patIdxEnd = patDirs.length - 1;
int strIdxStart = 0;
int strIdxEnd = strDirs.length - 1;
// up to first '**'
- while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd) {
char[] patDir = patDirs[patIdxStart];
- if ( isDoubleStar( patDir ) )
- {
+ if (isDoubleStar(patDir)) {
break;
}
- if ( !match( patDir, strDirs[strIdxStart], isCaseSensitive ) )
- {
+ if (!match(patDir, strDirs[strIdxStart], isCaseSensitive)) {
return false;
}
patIdxStart++;
strIdxStart++;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// String is exhausted
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !isDoubleStar( patDirs[i] ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!isDoubleStar(patDirs[i])) {
return false;
}
}
return true;
- }
- else
- {
- if ( patIdxStart > patIdxEnd )
- {
+ } else {
+ if (patIdxStart > patIdxEnd) {
// String not exhausted, but pattern is. Failure.
return false;
}
}
// up to last '**'
- while ( patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart <= patIdxEnd && strIdxStart <= strIdxEnd) {
char[] patDir = patDirs[patIdxEnd];
- if ( isDoubleStar( patDir ) )
- {
+ if (isDoubleStar(patDir)) {
break;
}
- if ( !match( patDir, strDirs[strIdxEnd], isCaseSensitive ) )
- {
+ if (!match(patDir, strDirs[strIdxEnd], isCaseSensitive)) {
return false;
}
patIdxEnd--;
strIdxEnd--;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// String is exhausted
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !isDoubleStar( patDirs[i] ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!isDoubleStar(patDirs[i])) {
return false;
}
}
return true;
}
- while ( patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
int patIdxTmp = -1;
- for ( int i = patIdxStart + 1; i <= patIdxEnd; i++ )
- {
- if ( isDoubleStar( patDirs[i] ) )
- {
+ for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
+ if (isDoubleStar(patDirs[i])) {
patIdxTmp = i;
break;
}
}
- if ( patIdxTmp == patIdxStart + 1 )
- {
+ if (patIdxTmp == patIdxStart + 1) {
// '**/**' situation, so skip one
patIdxStart++;
continue;
}
// Find the pattern between padIdxStart & padIdxTmp in str between
// strIdxStart & strIdxEnd
- int patLength = ( patIdxTmp - patIdxStart - 1 );
- int strLength = ( strIdxEnd - strIdxStart + 1 );
+ int patLength = (patIdxTmp - patIdxStart - 1);
+ int strLength = (strIdxEnd - strIdxStart + 1);
int foundIdx = -1;
- strLoop: for ( int i = 0; i <= strLength - patLength; i++ )
- {
- for ( int j = 0; j < patLength; j++ )
- {
+ strLoop:
+ for (int i = 0; i <= strLength - patLength; i++) {
+ for (int j = 0; j < patLength; j++) {
char[] subPat = patDirs[patIdxStart + j + 1];
char[] subStr = strDirs[strIdxStart + i + j];
- if ( !match( subPat, subStr, isCaseSensitive ) )
- {
+ if (!match(subPat, subStr, isCaseSensitive)) {
continue strLoop;
}
}
@@ -549,8 +469,7 @@ static boolean matchAntPathPattern( char[][] patDirs, char[][] strDirs, boolean
break;
}
- if ( foundIdx == -1 )
- {
+ if (foundIdx == -1) {
return false;
}
@@ -558,10 +477,8 @@ static boolean matchAntPathPattern( char[][] patDirs, char[][] strDirs, boolean
strIdxStart = foundIdx + patLength;
}
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( !isDoubleStar( patDirs[i] ) )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (!isDoubleStar(patDirs[i])) {
return false;
}
}
@@ -569,8 +486,7 @@ static boolean matchAntPathPattern( char[][] patDirs, char[][] strDirs, boolean
return true;
}
- private static boolean isDoubleStar( char[] patDir )
- {
+ private static boolean isDoubleStar(char[] patDir) {
return patDir != null && patDir.length == 2 && patDir[0] == '*' && patDir[1] == '*';
}
@@ -583,9 +499,8 @@ private static boolean isDoubleStar( char[] patDir )
* @param str The string which must be matched against the pattern. Must not be null.
* @return true if the string matches against the pattern, or false otherwise.
*/
- public static boolean match( String pattern, String str )
- {
- return match( pattern, str, true );
+ public static boolean match(String pattern, String str) {
+ return match(pattern, str, true);
}
/**
@@ -598,15 +513,13 @@ public static boolean match( String pattern, String str )
* @param isCaseSensitive Whether or not matching should be performed case sensitively.
* @return true if the string matches against the pattern, or false otherwise.
*/
- public static boolean match( String pattern, String str, boolean isCaseSensitive )
- {
+ public static boolean match(String pattern, String str, boolean isCaseSensitive) {
char[] patArr = pattern.toCharArray();
char[] strArr = str.toCharArray();
- return match( patArr, strArr, isCaseSensitive );
+ return match(patArr, strArr, isCaseSensitive);
}
- public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensitive )
- {
+ public static boolean match(char[] patArr, char[] strArr, boolean isCaseSensitive) {
int patIdxStart = 0;
int patIdxEnd = patArr.length - 1;
int strIdxStart = 0;
@@ -614,56 +527,44 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
char ch;
boolean containsStar = false;
- for ( char aPatArr : patArr )
- {
- if ( aPatArr == '*' )
- {
+ for (char aPatArr : patArr) {
+ if (aPatArr == '*') {
containsStar = true;
break;
}
}
- if ( !containsStar )
- {
+ if (!containsStar) {
// No '*'s, so we make a shortcut
- if ( patIdxEnd != strIdxEnd )
- {
+ if (patIdxEnd != strIdxEnd) {
return false; // Pattern and string do not have the same size
}
- for ( int i = 0; i <= patIdxEnd; i++ )
- {
+ for (int i = 0; i <= patIdxEnd; i++) {
ch = patArr[i];
- if ( ch != '?' && !equals( ch, strArr[i], isCaseSensitive ) )
- {
+ if (ch != '?' && !equals(ch, strArr[i], isCaseSensitive)) {
return false; // Character mismatch
}
}
return true; // String matches against pattern
}
- if ( patIdxEnd == 0 )
- {
+ if (patIdxEnd == 0) {
return true; // Pattern contains only '*', which matches anything
}
// Process characters before first star
- while ( ( ch = patArr[patIdxStart] ) != '*' && strIdxStart <= strIdxEnd )
- {
- if ( ch != '?' && !equals( ch, strArr[strIdxStart], isCaseSensitive ) )
- {
+ while ((ch = patArr[patIdxStart]) != '*' && strIdxStart <= strIdxEnd) {
+ if (ch != '?' && !equals(ch, strArr[strIdxStart], isCaseSensitive)) {
return false; // Character mismatch
}
patIdxStart++;
strIdxStart++;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// All characters in the string are used. Check if only '*'s are
// left in the pattern. If so, we succeeded. Otherwise failure.
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( patArr[i] != '*' )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (patArr[i] != '*') {
return false;
}
}
@@ -671,23 +572,18 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
}
// Process characters after last star
- while ( ( ch = patArr[patIdxEnd] ) != '*' && strIdxStart <= strIdxEnd )
- {
- if ( ch != '?' && !equals( ch, strArr[strIdxEnd], isCaseSensitive ) )
- {
+ while ((ch = patArr[patIdxEnd]) != '*' && strIdxStart <= strIdxEnd) {
+ if (ch != '?' && !equals(ch, strArr[strIdxEnd], isCaseSensitive)) {
return false; // Character mismatch
}
patIdxEnd--;
strIdxEnd--;
}
- if ( strIdxStart > strIdxEnd )
- {
+ if (strIdxStart > strIdxEnd) {
// All characters in the string are used. Check if only '*'s are
// left in the pattern. If so, we succeeded. Otherwise failure.
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( patArr[i] != '*' )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (patArr[i] != '*') {
return false;
}
}
@@ -696,35 +592,29 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
// process pattern between stars. padIdxStart and patIdxEnd point
// always to a '*'.
- while ( patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd )
- {
+ while (patIdxStart != patIdxEnd && strIdxStart <= strIdxEnd) {
int patIdxTmp = -1;
- for ( int i = patIdxStart + 1; i <= patIdxEnd; i++ )
- {
- if ( patArr[i] == '*' )
- {
+ for (int i = patIdxStart + 1; i <= patIdxEnd; i++) {
+ if (patArr[i] == '*') {
patIdxTmp = i;
break;
}
}
- if ( patIdxTmp == patIdxStart + 1 )
- {
+ if (patIdxTmp == patIdxStart + 1) {
// Two stars next to each other, skip the first one.
patIdxStart++;
continue;
}
// Find the pattern between padIdxStart & padIdxTmp in str between
// strIdxStart & strIdxEnd
- int patLength = ( patIdxTmp - patIdxStart - 1 );
- int strLength = ( strIdxEnd - strIdxStart + 1 );
+ int patLength = (patIdxTmp - patIdxStart - 1);
+ int strLength = (strIdxEnd - strIdxStart + 1);
int foundIdx = -1;
- strLoop: for ( int i = 0; i <= strLength - patLength; i++ )
- {
- for ( int j = 0; j < patLength; j++ )
- {
+ strLoop:
+ for (int i = 0; i <= strLength - patLength; i++) {
+ for (int j = 0; j < patLength; j++) {
ch = patArr[patIdxStart + j + 1];
- if ( ch != '?' && !equals( ch, strArr[strIdxStart + i + j], isCaseSensitive ) )
- {
+ if (ch != '?' && !equals(ch, strArr[strIdxStart + i + j], isCaseSensitive)) {
continue strLoop;
}
}
@@ -733,8 +623,7 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
break;
}
- if ( foundIdx == -1 )
- {
+ if (foundIdx == -1) {
return false;
}
@@ -744,10 +633,8 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
// All characters in the string are used. Check if only '*'s are left
// in the pattern. If so, we succeeded. Otherwise failure.
- for ( int i = patIdxStart; i <= patIdxEnd; i++ )
- {
- if ( patArr[i] != '*' )
- {
+ for (int i = patIdxStart; i <= patIdxEnd; i++) {
+ if (patArr[i] != '*') {
return false;
}
}
@@ -757,33 +644,27 @@ public static boolean match( char[] patArr, char[] strArr, boolean isCaseSensiti
/**
* Tests whether two characters are equal.
*/
- private static boolean equals( char c1, char c2, boolean isCaseSensitive )
- {
- if ( c1 == c2 )
- {
+ private static boolean equals(char c1, char c2, boolean isCaseSensitive) {
+ if (c1 == c2) {
return true;
}
- if ( !isCaseSensitive )
- {
+ if (!isCaseSensitive) {
// NOTE: Try both upper case and lower case as done by String.equalsIgnoreCase()
- if ( Character.toUpperCase( c1 ) == Character.toUpperCase( c2 )
- || Character.toLowerCase( c1 ) == Character.toLowerCase( c2 ) )
- {
+ if (Character.toUpperCase(c1) == Character.toUpperCase(c2)
+ || Character.toLowerCase(c1) == Character.toLowerCase(c2)) {
return true;
}
}
return false;
}
- private static String[] tokenizePathToString( String path, String separator )
- {
+ private static String[] tokenizePathToString(String path, String separator) {
List ret = new ArrayList();
- StringTokenizer st = new StringTokenizer( path, separator );
- while ( st.hasMoreTokens() )
- {
- ret.add( st.nextToken() );
+ StringTokenizer st = new StringTokenizer(path, separator);
+ while (st.hasMoreTokens()) {
+ ret.add(st.nextToken());
}
- return ret.toArray( new String[0] );
+ return ret.toArray(new String[0]);
}
/**
@@ -797,18 +678,14 @@ private static String[] tokenizePathToString( String path, String separator )
* @param granularity the amount in seconds of slack we will give in determining out of dateness
* @return whether the target is out of date
*/
- public static boolean isOutOfDate( File src, File target, int granularity )
- {
- if ( !src.exists() )
- {
+ public static boolean isOutOfDate(File src, File target, int granularity) {
+ if (!src.exists()) {
return false;
}
- if ( !target.exists() )
- {
+ if (!target.exists()) {
return true;
}
- if ( ( src.lastModified() - granularity ) > target.lastModified() )
- {
+ if ((src.lastModified() - granularity) > target.lastModified()) {
return true;
}
return false;
@@ -821,17 +698,32 @@ public static boolean isOutOfDate( File src, File target, int granularity )
* @param input a String to remove all whitespace.
* @return a String that has had all whitespace removed.
*/
- public static String removeWhitespace( String input )
- {
+ public static String removeWhitespace(String input) {
StringBuilder result = new StringBuilder();
- if ( input != null )
- {
- StringTokenizer st = new StringTokenizer( input );
- while ( st.hasMoreTokens() )
- {
- result.append( st.nextToken() );
+ if (input != null) {
+ StringTokenizer st = new StringTokenizer(input);
+ while (st.hasMoreTokens()) {
+ result.append(st.nextToken());
}
}
return result.toString();
}
+
+ /**
+ * Extract the pattern without the Regex or Ant prefix. In the case of Ant style matches ensure
+ * that the path uses specified separator.
+ * @param pattern the pattern to extract from.
+ * @param separator the system file name separator in the pattern.
+ * @return The pattern without the Regex or Ant prefix.
+ */
+ public static String extractPattern(final String pattern, final String separator) {
+ if (isRegexPrefixedPattern(pattern)) {
+ return pattern.substring(REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length());
+ } else {
+ String localPattern = isAntPrefixedPattern(pattern)
+ ? pattern.substring(ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length())
+ : pattern;
+ return toOSRelatedPath(localPattern, separator);
+ }
+ }
}
diff --git a/src/main/java/org/codehaus/plexus/util/StringInputStream.java b/src/main/java/org/codehaus/plexus/util/StringInputStream.java
index ea1c46c8..1e3ca5f5 100644
--- a/src/main/java/org/codehaus/plexus/util/StringInputStream.java
+++ b/src/main/java/org/codehaus/plexus/util/StringInputStream.java
@@ -70,9 +70,7 @@
* {@link java.io.ByteArrayInputStream}.
*/
@Deprecated
-public class StringInputStream
- extends InputStream
-{
+public class StringInputStream extends InputStream {
/** Source string, stored as a StringReader */
private StringReader in;
@@ -81,9 +79,8 @@ public class StringInputStream
*
* @param source The string to read from. Must not be null.
*/
- public StringInputStream( String source )
- {
- in = new StringReader( source );
+ public StringInputStream(String source) {
+ in = new StringReader(source);
}
/**
@@ -94,9 +91,7 @@ public StringInputStream( String source )
* @exception IOException if the original StringReader fails to be read
*/
@Override
- public int read()
- throws IOException
- {
+ public int read() throws IOException {
return in.read();
}
@@ -106,9 +101,7 @@ public int read()
* @exception IOException if the original StringReader fails to be closed
*/
@Override
- public void close()
- throws IOException
- {
+ public void close() throws IOException {
in.close();
}
@@ -118,15 +111,11 @@ public void close()
* @param limit the maximum limit of bytes that can be read before the mark position becomes invalid
*/
@Override
- public synchronized void mark( final int limit )
- {
- try
- {
- in.mark( limit );
- }
- catch ( IOException ioe )
- {
- throw new RuntimeException( ioe.getMessage() );
+ public synchronized void mark(final int limit) {
+ try {
+ in.mark(limit);
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe.getMessage());
}
}
@@ -136,9 +125,7 @@ public synchronized void mark( final int limit )
* @exception IOException if the StringReader fails to be reset
*/
@Override
- public synchronized void reset()
- throws IOException
- {
+ public synchronized void reset() throws IOException {
in.reset();
}
@@ -146,8 +133,7 @@ public synchronized void reset()
* @see InputStream#markSupported
*/
@Override
- public boolean markSupported()
- {
+ public boolean markSupported() {
return in.markSupported();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/StringOutputStream.java b/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
index ef22b575..60474d81 100644
--- a/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
+++ b/src/main/java/org/codehaus/plexus/util/StringOutputStream.java
@@ -28,37 +28,28 @@
* encoding. Instead, use {@link java.io.ByteArrayOutputStream#toString(String)}.
*/
@Deprecated
-public class StringOutputStream
- extends OutputStream
-{
+public class StringOutputStream extends OutputStream {
private StringBuffer buf = new StringBuffer();
@Override
- public void write( byte[] b )
- throws IOException
- {
- buf.append( new String( b ) );
+ public void write(byte[] b) throws IOException {
+ buf.append(new String(b));
}
@Override
- public void write( byte[] b, int off, int len )
- throws IOException
- {
- buf.append( new String( b, off, len ) );
+ public void write(byte[] b, int off, int len) throws IOException {
+ buf.append(new String(b, off, len));
}
@Override
- public void write( int b )
- throws IOException
- {
+ public void write(int b) throws IOException {
byte[] bytes = new byte[1];
bytes[0] = (byte) b;
- buf.append( new String( bytes ) );
+ buf.append(new String(bytes));
}
@Override
- public String toString()
- {
+ public String toString() {
return buf.toString();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/StringUtils.java b/src/main/java/org/codehaus/plexus/util/StringUtils.java
index 2e6a2f3f..edae9844 100644
--- a/src/main/java/org/codehaus/plexus/util/StringUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/StringUtils.java
@@ -82,8 +82,7 @@
* @since 1.0
*
*/
-public class StringUtils
-{
+public class StringUtils {
/**
*
* StringUtils instances should NOT be constructed in standard programming. Instead, the class should
@@ -93,9 +92,7 @@ public class StringUtils
* This constructor is public to permit tools that require a JavaBean manager to operate.
*
*/
- public StringUtils()
- {
- }
+ public StringUtils() {}
// Empty
// --------------------------------------------------------------------------
@@ -110,9 +107,8 @@ public StringUtils()
* @param str the String to check
* @return the trimmed text (never null)
*/
- public static String clean( String str )
- {
- return ( str == null ? "" : str.trim() );
+ public static String clean(String str) {
+ return (str == null ? "" : str.trim());
}
/**
@@ -125,9 +121,8 @@ public static String clean( String str )
* @param str the String to check
* @return the trimmed text (or null)
*/
- public static String trim( String str )
- {
- return ( str == null ? null : str.trim() );
+ public static String trim(String str) {
+ return (str == null ? null : str.trim());
}
/**
@@ -141,49 +136,39 @@ public static String trim( String str )
* @param str String target to delete whitespace from
* @return the String without whitespaces
*/
- public static String deleteWhitespace( String str )
- {
+ public static String deleteWhitespace(String str) {
StringBuilder buffer = new StringBuilder();
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( !Character.isWhitespace( str.charAt( i ) ) )
- {
- buffer.append( str.charAt( i ) );
+ for (int i = 0; i < sz; i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
+ buffer.append(str.charAt(i));
}
}
return buffer.toString();
}
/**
- *
* Checks if a String is non null and is not empty (length > 0).
- *
*
* @param str the String to check
* @return true if the String is non-null, and not length zero
*/
- public static boolean isNotEmpty( String str )
- {
- return ( ( str != null ) && ( !str.isEmpty() ) );
+ public static boolean isNotEmpty(String str) {
+ return ((str != null) && (!str.isEmpty()));
}
/**
+ * Checks if a String is null or empty.
*
- * Checks if a (trimmed) String is null or empty.
- *
- *
- * Note: In future releases, this method will no longer trim the input string such that it works
- * complementary to {@link #isNotEmpty(String)}. Code that wants to test for whitespace-only strings should be
- * migrated to use {@link #isBlank(String)} instead.
- *
+ * Note: In releases prior 3.5.0, this method trimmed the input string such that it worked
+ * the same as {@link #isBlank(String)}. Since release 3.5.0 it no longer returns {@code true} for strings
+ * containing only whitespace characters.
*
* @param str the String to check
- * @return true if the String is null, or length zero once trimmed
+ * @return true if the String is null, or length zero
*/
- public static boolean isEmpty( String str )
- {
- return ( ( str == null ) || ( str.trim().isEmpty() ) );
+ public static boolean isEmpty(String str) {
+ return ((str == null) || (str.isEmpty()));
}
/**
@@ -203,17 +188,13 @@ public static boolean isEmpty( String str )
* @return true if the String is null, empty or whitespace
* @since 1.5.2
*/
- public static boolean isBlank( String str )
- {
+ public static boolean isBlank(String str) {
int strLen;
- if ( str == null || ( strLen = str.length() ) == 0 )
- {
+ if (str == null || (strLen = str.length()) == 0) {
return true;
}
- for ( int i = 0; i < strLen; i++ )
- {
- if ( !Character.isWhitespace( str.charAt( i ) ) )
- {
+ for (int i = 0; i < strLen; i++) {
+ if (!Character.isWhitespace(str.charAt(i))) {
return false;
}
}
@@ -237,9 +218,8 @@ public static boolean isBlank( String str )
* @return true if the String is not empty and not null and not whitespace
* @since 1.5.2
*/
- public static boolean isNotBlank( String str )
- {
- return !StringUtils.isBlank( str );
+ public static boolean isNotBlank(String str) {
+ return !StringUtils.isBlank(str);
}
// Equals and IndexOf
@@ -261,9 +241,8 @@ public static boolean isNotBlank( String str )
* @see Objects#equals(Object, Object)
*/
@Deprecated
- public static boolean equals( String str1, String str2 )
- {
- return Objects.equals( str1, str2 );
+ public static boolean equals(String str1, String str2) {
+ return Objects.equals(str1, str2);
}
/**
@@ -280,9 +259,8 @@ public static boolean equals( String str1, String str2 )
* @param str2 the second string
* @return true if the Strings are equal, case insensitive, or both null
*/
- public static boolean equalsIgnoreCase( String str1, String str2 )
- {
- return ( str1 == null ? str2 == null : str1.equalsIgnoreCase( str2 ) );
+ public static boolean equalsIgnoreCase(String str1, String str2) {
+ return (str1 == null ? str2 == null : str1.equalsIgnoreCase(str2));
}
/**
@@ -298,10 +276,8 @@ public static boolean equalsIgnoreCase( String str1, String str2 )
* @return the first index of any of the searchStrs in str
* @throws NullPointerException if any of searchStrs[i] is null
*/
- public static int indexOfAny( String str, String[] searchStrs )
- {
- if ( ( str == null ) || ( searchStrs == null ) )
- {
+ public static int indexOfAny(String str, String[] searchStrs) {
+ if ((str == null) || (searchStrs == null)) {
return -1;
}
int sz = searchStrs.length;
@@ -310,21 +286,18 @@ public static int indexOfAny( String str, String[] searchStrs )
int ret = Integer.MAX_VALUE;
int tmp;
- for ( String searchStr : searchStrs )
- {
- tmp = str.indexOf( searchStr );
- if ( tmp == -1 )
- {
+ for (String searchStr : searchStrs) {
+ tmp = str.indexOf(searchStr);
+ if (tmp == -1) {
continue;
}
- if ( tmp < ret )
- {
+ if (tmp < ret) {
ret = tmp;
}
}
- return ( ret == Integer.MAX_VALUE ) ? -1 : ret;
+ return (ret == Integer.MAX_VALUE) ? -1 : ret;
}
/**
@@ -340,19 +313,15 @@ public static int indexOfAny( String str, String[] searchStrs )
* @return the last index of any of the Strings
* @throws NullPointerException if any of searchStrs[i] is null
*/
- public static int lastIndexOfAny( String str, String[] searchStrs )
- {
- if ( ( str == null ) || ( searchStrs == null ) )
- {
+ public static int lastIndexOfAny(String str, String[] searchStrs) {
+ if ((str == null) || (searchStrs == null)) {
return -1;
}
int ret = -1;
int tmp;
- for ( String searchStr : searchStrs )
- {
- tmp = str.lastIndexOf( searchStr );
- if ( tmp > ret )
- {
+ for (String searchStr : searchStrs) {
+ tmp = str.lastIndexOf(searchStr);
+ if (tmp > ret) {
ret = tmp;
}
}
@@ -375,29 +344,24 @@ public static int lastIndexOfAny( String str, String[] searchStrs )
* characters
* @return substring from start position
*/
- public static String substring( String str, int start )
- {
- if ( str == null )
- {
+ public static String substring(String str, int start) {
+ if (str == null) {
return null;
}
// handle negatives, which means last n characters
- if ( start < 0 )
- {
+ if (start < 0) {
start = str.length() + start; // remember start is negative
}
- if ( start < 0 )
- {
+ if (start < 0) {
start = 0;
}
- if ( start > str.length() )
- {
+ if (start > str.length()) {
return "";
}
- return str.substring( start );
+ return str.substring(start);
}
/**
@@ -415,46 +379,38 @@ public static String substring( String str, int start )
* characters
* @return substring from start position to end position
*/
- public static String substring( String str, int start, int end )
- {
- if ( str == null )
- {
+ public static String substring(String str, int start, int end) {
+ if (str == null) {
return null;
}
// handle negatives
- if ( end < 0 )
- {
+ if (end < 0) {
end = str.length() + end; // remember end is negative
}
- if ( start < 0 )
- {
+ if (start < 0) {
start = str.length() + start; // remember start is negative
}
// check length next
- if ( end > str.length() )
- {
+ if (end > str.length()) {
// check this works.
end = str.length();
}
// if start is greater than end, return ""
- if ( start > end )
- {
+ if (start > end) {
return "";
}
- if ( start < 0 )
- {
+ if (start < 0) {
start = 0;
}
- if ( end < 0 )
- {
+ if (end < 0) {
end = 0;
}
- return str.substring( start, end );
+ return str.substring(start, end);
}
/**
@@ -471,19 +427,14 @@ public static String substring( String str, int start, int end )
* @return the leftmost characters
* @throws IllegalArgumentException if len is less than zero
*/
- public static String left( String str, int len )
- {
- if ( len < 0 )
- {
- throw new IllegalArgumentException( "Requested String length " + len + " is less than zero" );
+ public static String left(String str, int len) {
+ if (len < 0) {
+ throw new IllegalArgumentException("Requested String length " + len + " is less than zero");
}
- if ( ( str == null ) || ( str.length() <= len ) )
- {
+ if ((str == null) || (str.length() <= len)) {
return str;
- }
- else
- {
- return str.substring( 0, len );
+ } else {
+ return str.substring(0, len);
}
}
@@ -501,19 +452,14 @@ public static String left( String str, int len )
* @return the leftmost characters
* @throws IllegalArgumentException if len is less than zero
*/
- public static String right( String str, int len )
- {
- if ( len < 0 )
- {
- throw new IllegalArgumentException( "Requested String length " + len + " is less than zero" );
+ public static String right(String str, int len) {
+ if (len < 0) {
+ throw new IllegalArgumentException("Requested String length " + len + " is less than zero");
}
- if ( ( str == null ) || ( str.length() <= len ) )
- {
+ if ((str == null) || (str.length() <= len)) {
return str;
- }
- else
- {
- return str.substring( str.length() - len );
+ } else {
+ return str.substring(str.length() - len);
}
}
@@ -533,27 +479,20 @@ public static String right( String str, int len )
* @throws IndexOutOfBoundsException if pos is out of bounds
* @throws IllegalArgumentException if len is less than zero
*/
- public static String mid( String str, int pos, int len )
- {
- if ( ( pos < 0 ) || ( ( str != null ) && ( pos > str.length() ) ) )
- {
- throw new StringIndexOutOfBoundsException( "String index " + pos + " is out of bounds" );
+ public static String mid(String str, int pos, int len) {
+ if ((pos < 0) || ((str != null) && (pos > str.length()))) {
+ throw new StringIndexOutOfBoundsException("String index " + pos + " is out of bounds");
}
- if ( len < 0 )
- {
- throw new IllegalArgumentException( "Requested String length " + len + " is less than zero" );
+ if (len < 0) {
+ throw new IllegalArgumentException("Requested String length " + len + " is less than zero");
}
- if ( str == null )
- {
+ if (str == null) {
return null;
}
- if ( str.length() <= ( pos + len ) )
- {
- return str.substring( pos );
- }
- else
- {
- return str.substring( pos, pos + len );
+ if (str.length() <= (pos + len)) {
+ return str.substring(pos);
+ } else {
+ return str.substring(pos, pos + len);
}
}
@@ -571,9 +510,8 @@ public static String mid( String str, int pos, int len )
* @param str the String to parse
* @return an array of parsed Strings
*/
- public static String[] split( String str )
- {
- return split( str, null, -1 );
+ public static String[] split(String str) {
+ return split(str, null, -1);
}
/**
@@ -581,9 +519,8 @@ public static String[] split( String str )
* @param separator Characters used as the delimiters. If null, splits on whitespace.
* @return an array of parsed Strings
*/
- public static String[] split( String text, String separator )
- {
- return split( text, separator, -1 );
+ public static String[] split(String text, String separator) {
+ return split(text, separator, -1);
}
/**
@@ -604,23 +541,18 @@ public static String[] split( String text, String separator )
* @param max The maximum number of elements to include in the array. A zero or negative value implies no limit.
* @return an array of parsed Strings
*/
- public static String[] split( String str, String separator, int max )
- {
+ public static String[] split(String str, String separator, int max) {
StringTokenizer tok;
- if ( separator == null )
- {
+ if (separator == null) {
// Null separator means we're using StringTokenizer's default
// delimiter, which comprises all whitespace characters.
- tok = new StringTokenizer( str );
- }
- else
- {
- tok = new StringTokenizer( str, separator );
+ tok = new StringTokenizer(str);
+ } else {
+ tok = new StringTokenizer(str, separator);
}
int listSize = tok.countTokens();
- if ( ( max > 0 ) && ( listSize > max ) )
- {
+ if ((max > 0) && (listSize > max)) {
listSize = max;
}
@@ -628,22 +560,18 @@ public static String[] split( String str, String separator, int max )
int i = 0;
int lastTokenBegin;
int lastTokenEnd = 0;
- while ( tok.hasMoreTokens() )
- {
- if ( ( max > 0 ) && ( i == listSize - 1 ) )
- {
+ while (tok.hasMoreTokens()) {
+ if ((max > 0) && (i == listSize - 1)) {
// In the situation where we hit the max yet have
// tokens left over in our input, the last list
// element gets all remaining text.
String endToken = tok.nextToken();
- lastTokenBegin = str.indexOf( endToken, lastTokenEnd );
- list[i] = str.substring( lastTokenBegin );
+ lastTokenBegin = str.indexOf(endToken, lastTokenEnd);
+ list[i] = str.substring(lastTokenBegin);
break;
- }
- else
- {
+ } else {
list[i] = tok.nextToken();
- lastTokenBegin = str.indexOf( list[i], lastTokenEnd );
+ lastTokenBegin = str.indexOf(list[i], lastTokenEnd);
lastTokenEnd = lastTokenBegin + list[i].length();
}
i++;
@@ -664,9 +592,8 @@ public static String[] split( String str, String separator, int max )
* @param array the array of values to concatenate.
* @return the concatenated string.
*/
- public static String concatenate( Object[] array )
- {
- return join( array, "" );
+ public static String concatenate(Object[] array) {
+ return join(array, "");
}
/**
@@ -681,23 +608,19 @@ public static String concatenate( Object[] array )
* @param separator the separator character to use
* @return the joined String
*/
- public static String join( Object[] array, String separator )
- {
- if ( separator == null )
- {
+ public static String join(Object[] array, String separator) {
+ if (separator == null) {
separator = "";
}
int arraySize = array.length;
- int bufSize = ( arraySize == 0 ? 0 : ( array[0].toString().length() + separator.length() ) * arraySize );
- StringBuilder buf = new StringBuilder( bufSize );
-
- for ( int i = 0; i < arraySize; i++ )
- {
- if ( i > 0 )
- {
- buf.append( separator );
+ int bufSize = (arraySize == 0 ? 0 : (array[0].toString().length() + separator.length()) * arraySize);
+ StringBuilder buf = new StringBuilder(bufSize);
+
+ for (int i = 0; i < arraySize; i++) {
+ if (i > 0) {
+ buf.append(separator);
}
- buf.append( array[i] );
+ buf.append(array[i]);
}
return buf.toString();
}
@@ -714,19 +637,15 @@ public static String join( Object[] array, String separator )
* @param separator the separator character to use
* @return the joined String
*/
- public static String join( Iterator iterator, String separator )
- {
- if ( separator == null )
- {
+ public static String join(Iterator iterator, String separator) {
+ if (separator == null) {
separator = "";
}
- StringBuilder buf = new StringBuilder( 256 ); // Java default is 16, probably too small
- while ( iterator.hasNext() )
- {
- buf.append( iterator.next() );
- if ( iterator.hasNext() )
- {
- buf.append( separator );
+ StringBuilder buf = new StringBuilder(256); // Java default is 16, probably too small
+ while (iterator.hasNext()) {
+ buf.append(iterator.next());
+ if (iterator.hasNext()) {
+ buf.append(separator);
}
}
return buf.toString();
@@ -749,9 +668,8 @@ public static String join( Iterator iterator, String separator )
* @param with char to replace with
* @return the text with any replacements processed
*/
- public static String replaceOnce( String text, char repl, char with )
- {
- return replace( text, repl, with, 1 );
+ public static String replaceOnce(String text, char repl, char with) {
+ return replace(text, repl, with, 1);
}
/**
@@ -768,9 +686,8 @@ public static String replaceOnce( String text, char repl, char with )
* @param with char to replace with
* @return the text with any replacements processed
*/
- public static String replace( String text, char repl, char with )
- {
- return replace( text, repl, with, -1 );
+ public static String replace(String text, char repl, char with) {
+ return replace(text, repl, with, -1);
}
/**
@@ -788,9 +705,8 @@ public static String replace( String text, char repl, char with )
* @param max maximum number of values to replace, or -1 if no maximum
* @return the text with any replacements processed
*/
- public static String replace( String text, char repl, char with, int max )
- {
- return replace( text, String.valueOf( repl ), String.valueOf( with ), max );
+ public static String replace(String text, char repl, char with, int max) {
+ return replace(text, String.valueOf(repl), String.valueOf(with), max);
}
/**
@@ -807,9 +723,8 @@ public static String replace( String text, char repl, char with, int max )
* @param with String to replace with
* @return the text with any replacements processed
*/
- public static String replaceOnce( String text, String repl, String with )
- {
- return replace( text, repl, with, 1 );
+ public static String replaceOnce(String text, String repl, String with) {
+ return replace(text, repl, with, 1);
}
/**
@@ -826,9 +741,8 @@ public static String replaceOnce( String text, String repl, String with )
* @param with String to replace with
* @return the text with any replacements processed
*/
- public static String replace( String text, String repl, String with )
- {
- return replace( text, repl, with, -1 );
+ public static String replace(String text, String repl, String with) {
+ return replace(text, repl, with, -1);
}
/**
@@ -846,26 +760,22 @@ public static String replace( String text, String repl, String with )
* @param max maximum number of values to replace, or -1 if no maximum
* @return the text with any replacements processed
*/
- public static String replace( String text, String repl, String with, int max )
- {
- if ( ( text == null ) || ( repl == null ) || ( with == null ) || ( repl.length() == 0 ) )
- {
+ public static String replace(String text, String repl, String with, int max) {
+ if ((text == null) || (repl == null) || (with == null) || (repl.length() == 0)) {
return text;
}
- StringBuilder buf = new StringBuilder( text.length() );
+ StringBuilder buf = new StringBuilder(text.length());
int start = 0, end;
- while ( ( end = text.indexOf( repl, start ) ) != -1 )
- {
- buf.append( text, start, end ).append( with );
+ while ((end = text.indexOf(repl, start)) != -1) {
+ buf.append(text, start, end).append(with);
start = end + repl.length();
- if ( --max == 0 )
- {
+ if (--max == 0) {
break;
}
}
- buf.append( text, start, text.length() );
+ buf.append(text, start, text.length());
return buf.toString();
}
@@ -881,10 +791,12 @@ public static String replace( String text, String repl, String with, int max )
* @return String with overlayed text
* @throws NullPointerException if text or overlay is null
*/
- public static String overlayString( String text, String overlay, int start, int end )
- {
- return new StringBuilder( start + overlay.length() + text.length() - end
- + 1 ).append( text, 0, start ).append( overlay ).append( text, end, text.length() ).toString();
+ public static String overlayString(String text, String overlay, int start, int end) {
+ return new StringBuilder(start + overlay.length() + text.length() - end + 1)
+ .append(text, 0, start)
+ .append(overlay)
+ .append(text, end, text.length())
+ .toString();
}
// Centering
@@ -903,9 +815,8 @@ public static String overlayString( String text, String overlay, int start, int
* @return String containing centered String
* @throws NullPointerException if str is null
*/
- public static String center( String str, int size )
- {
- return center( str, size, " " );
+ public static String center(String str, int size) {
+ return center(str, size, " ");
}
/**
@@ -923,16 +834,14 @@ public static String center( String str, int size )
* @throws NullPointerException if str or delim is null
* @throws ArithmeticException if delim is the empty String
*/
- public static String center( String str, int size, String delim )
- {
+ public static String center(String str, int size, String delim) {
int sz = str.length();
int p = size - sz;
- if ( p < 1 )
- {
+ if (p < 1) {
return str;
}
- str = leftPad( str, sz + p / 2, delim );
- str = rightPad( str, size, delim );
+ str = leftPad(str, sz + p / 2, delim);
+ str = rightPad(str, size, delim);
return str;
}
@@ -948,9 +857,8 @@ public static String center( String str, int size, String delim )
* @return String without chomped newline
* @throws NullPointerException if str is null
*/
- public static String chomp( String str )
- {
- return chomp( str, "\n" );
+ public static String chomp(String str) {
+ return chomp(str, "\n");
}
/**
@@ -963,15 +871,11 @@ public static String chomp( String str )
* @return String without chomped ending
* @throws NullPointerException if str or sep is null
*/
- public static String chomp( String str, String sep )
- {
- int idx = str.lastIndexOf( sep );
- if ( idx != -1 )
- {
- return str.substring( 0, idx );
- }
- else
- {
+ public static String chomp(String str, String sep) {
+ int idx = str.lastIndexOf(sep);
+ if (idx != -1) {
+ return str.substring(0, idx);
+ } else {
return str;
}
}
@@ -985,9 +889,8 @@ public static String chomp( String str, String sep )
* @return String without chomped ending
* @throws NullPointerException if str is null
*/
- public static String chompLast( String str )
- {
- return chompLast( str, "\n" );
+ public static String chompLast(String str) {
+ return chompLast(str, "\n");
}
/**
@@ -1000,19 +903,14 @@ public static String chompLast( String str )
* @return String without chomped ending
* @throws NullPointerException if str or sep is null
*/
- public static String chompLast( String str, String sep )
- {
- if ( str.length() == 0 )
- {
+ public static String chompLast(String str, String sep) {
+ if (str.length() == 0) {
return str;
}
- String sub = str.substring( str.length() - sep.length() );
- if ( sep.equals( sub ) )
- {
- return str.substring( 0, str.length() - sep.length() );
- }
- else
- {
+ String sub = str.substring(str.length() - sep.length());
+ if (sep.equals(sub)) {
+ return str.substring(0, str.length() - sep.length());
+ } else {
return str;
}
}
@@ -1027,19 +925,13 @@ public static String chompLast( String str, String sep )
* @return String chomped
* @throws NullPointerException if str or sep is null
*/
- public static String getChomp( String str, String sep )
- {
- int idx = str.lastIndexOf( sep );
- if ( idx == str.length() - sep.length() )
- {
+ public static String getChomp(String str, String sep) {
+ int idx = str.lastIndexOf(sep);
+ if (idx == str.length() - sep.length()) {
return sep;
- }
- else if ( idx != -1 )
- {
- return str.substring( idx );
- }
- else
- {
+ } else if (idx != -1) {
+ return str.substring(idx);
+ } else {
return "";
}
}
@@ -1054,15 +946,11 @@ else if ( idx != -1 )
* @return String without chomped beginning
* @throws NullPointerException if str or sep is null
*/
- public static String prechomp( String str, String sep )
- {
- int idx = str.indexOf( sep );
- if ( idx != -1 )
- {
- return str.substring( idx + sep.length() );
- }
- else
- {
+ public static String prechomp(String str, String sep) {
+ int idx = str.indexOf(sep);
+ if (idx != -1) {
+ return str.substring(idx + sep.length());
+ } else {
return str;
}
}
@@ -1077,15 +965,11 @@ public static String prechomp( String str, String sep )
* @return String prechomped
* @throws NullPointerException if str or sep is null
*/
- public static String getPrechomp( String str, String sep )
- {
- int idx = str.indexOf( sep );
- if ( idx != -1 )
- {
- return str.substring( 0, idx + sep.length() );
- }
- else
- {
+ public static String getPrechomp(String str, String sep) {
+ int idx = str.indexOf(sep);
+ if (idx != -1) {
+ return str.substring(0, idx + sep.length());
+ } else {
return "";
}
}
@@ -1105,24 +989,19 @@ public static String getPrechomp( String str, String sep )
* @return String without last character
* @throws NullPointerException if str is null
*/
- public static String chop( String str )
- {
- if ( "".equals( str ) )
- {
+ public static String chop(String str) {
+ if ("".equals(str)) {
return "";
}
- if ( str.length() == 1 )
- {
+ if (str.length() == 1) {
return "";
}
int lastIdx = str.length() - 1;
- String ret = str.substring( 0, lastIdx );
- char last = str.charAt( lastIdx );
- if ( last == '\n' )
- {
- if ( ret.charAt( lastIdx - 1 ) == '\r' )
- {
- return ret.substring( 0, lastIdx - 1 );
+ String ret = str.substring(0, lastIdx);
+ char last = str.charAt(lastIdx);
+ if (last == '\n') {
+ if (ret.charAt(lastIdx - 1) == '\r') {
+ return ret.substring(0, lastIdx - 1);
}
}
return ret;
@@ -1138,22 +1017,17 @@ public static String chop( String str )
* @return String without newline
* @throws NullPointerException if str is null
*/
- public static String chopNewline( String str )
- {
+ public static String chopNewline(String str) {
int lastIdx = str.length() - 1;
- char last = str.charAt( lastIdx );
- if ( last == '\n' )
- {
- if ( str.charAt( lastIdx - 1 ) == '\r' )
- {
+ char last = str.charAt(lastIdx);
+ if (last == '\n') {
+ if (str.charAt(lastIdx - 1) == '\r') {
lastIdx--;
}
- }
- else
- {
+ } else {
lastIdx++;
}
- return str.substring( 0, lastIdx );
+ return str.substring(0, lastIdx);
}
// Conversion
@@ -1172,83 +1046,67 @@ public static String chopNewline( String str )
* @return String with escaped values
* @throws NullPointerException if str is null
*/
- public static String escape( String str )
- {
+ public static String escape(String str) {
// improved with code from cybertiger@cyberiantiger.org
// unicode from him, and default for < 32's.
int sz = str.length();
- StringBuilder buffer = new StringBuilder( 2 * sz );
- for ( int i = 0; i < sz; i++ )
- {
- char ch = str.charAt( i );
+ StringBuilder buffer = new StringBuilder(2 * sz);
+ for (int i = 0; i < sz; i++) {
+ char ch = str.charAt(i);
// handle unicode
- if ( ch > 0xfff )
- {
- buffer.append( "\\u" + Integer.toHexString( ch ) );
- }
- else if ( ch > 0xff )
- {
- buffer.append( "\\u0" + Integer.toHexString( ch ) );
- }
- else if ( ch > 0x7f )
- {
- buffer.append( "\\u00" + Integer.toHexString( ch ) );
- }
- else if ( ch < 32 )
- {
- switch ( ch )
- {
+ if (ch > 0xfff) {
+ buffer.append("\\u" + Integer.toHexString(ch));
+ } else if (ch > 0xff) {
+ buffer.append("\\u0" + Integer.toHexString(ch));
+ } else if (ch > 0x7f) {
+ buffer.append("\\u00" + Integer.toHexString(ch));
+ } else if (ch < 32) {
+ switch (ch) {
case '\b':
- buffer.append( '\\' );
- buffer.append( 'b' );
+ buffer.append('\\');
+ buffer.append('b');
break;
case '\n':
- buffer.append( '\\' );
- buffer.append( 'n' );
+ buffer.append('\\');
+ buffer.append('n');
break;
case '\t':
- buffer.append( '\\' );
- buffer.append( 't' );
+ buffer.append('\\');
+ buffer.append('t');
break;
case '\f':
- buffer.append( '\\' );
- buffer.append( 'f' );
+ buffer.append('\\');
+ buffer.append('f');
break;
case '\r':
- buffer.append( '\\' );
- buffer.append( 'r' );
+ buffer.append('\\');
+ buffer.append('r');
break;
default:
- if ( ch > 0xf )
- {
- buffer.append( "\\u00" + Integer.toHexString( ch ) );
- }
- else
- {
- buffer.append( "\\u000" + Integer.toHexString( ch ) );
+ if (ch > 0xf) {
+ buffer.append("\\u00" + Integer.toHexString(ch));
+ } else {
+ buffer.append("\\u000" + Integer.toHexString(ch));
}
break;
}
- }
- else
- {
- switch ( ch )
- {
+ } else {
+ switch (ch) {
case '\'':
- buffer.append( '\\' );
- buffer.append( '\'' );
+ buffer.append('\\');
+ buffer.append('\'');
break;
case '"':
- buffer.append( '\\' );
- buffer.append( '"' );
+ buffer.append('\\');
+ buffer.append('"');
break;
case '\\':
- buffer.append( '\\' );
- buffer.append( '\\' );
+ buffer.append('\\');
+ buffer.append('\\');
break;
default:
- buffer.append( ch );
+ buffer.append(ch);
break;
}
}
@@ -1270,12 +1128,10 @@ else if ( ch < 32 )
* @throws NegativeArraySizeException if repeat < 0
* @throws NullPointerException if str is null
*/
- public static String repeat( String str, int repeat )
- {
- StringBuilder buffer = new StringBuilder( repeat * str.length() );
- for ( int i = 0; i < repeat; i++ )
- {
- buffer.append( str );
+ public static String repeat(String str, int repeat) {
+ StringBuilder buffer = new StringBuilder(repeat * str.length());
+ for (int i = 0; i < repeat; i++) {
+ buffer.append(str);
}
return buffer.toString();
}
@@ -1293,9 +1149,8 @@ public static String repeat( String str, int repeat )
* @return right padded String
* @throws NullPointerException if str is null
*/
- public static String rightPad( String str, int size )
- {
- return rightPad( str, size, " " );
+ public static String rightPad(String str, int size) {
+ return rightPad(str, size, " ");
}
/**
@@ -1313,12 +1168,10 @@ public static String rightPad( String str, int size )
* @throws NullPointerException if str or delim is null
* @throws ArithmeticException if delim is the empty String
*/
- public static String rightPad( String str, int size, String delim )
- {
- size = ( size - str.length() ) / delim.length();
- if ( size > 0 )
- {
- str += repeat( delim, size );
+ public static String rightPad(String str, int size, String delim) {
+ size = (size - str.length()) / delim.length();
+ if (size > 0) {
+ str += repeat(delim, size);
}
return str;
}
@@ -1336,9 +1189,8 @@ public static String rightPad( String str, int size, String delim )
* @return left padded String
* @throws NullPointerException if str or delim is null
*/
- public static String leftPad( String str, int size )
- {
- return leftPad( str, size, " " );
+ public static String leftPad(String str, int size) {
+ return leftPad(str, size, " ");
}
/**
@@ -1351,12 +1203,10 @@ public static String leftPad( String str, int size )
* @throws NullPointerException if str or delim is null
* @throws ArithmeticException if delim is the empty string
*/
- public static String leftPad( String str, int size, String delim )
- {
- size = ( size - str.length() ) / delim.length();
- if ( size > 0 )
- {
- str = repeat( delim, size ) + str;
+ public static String leftPad(String str, int size, String delim) {
+ size = (size - str.length()) / delim.length();
+ if (size > 0) {
+ str = repeat(delim, size) + str;
}
return str;
}
@@ -1372,9 +1222,8 @@ public static String leftPad( String str, int size, String delim )
* @param str the String to remove whitespace from
* @return the stripped String
*/
- public static String strip( String str )
- {
- return strip( str, null );
+ public static String strip(String str) {
+ return strip(str, null);
}
/**
@@ -1389,10 +1238,9 @@ public static String strip( String str )
* @param delim the String to remove at start and end
* @return the stripped String
*/
- public static String strip( String str, String delim )
- {
- str = stripStart( str, delim );
- return stripEnd( str, delim );
+ public static String strip(String str, String delim) {
+ str = stripStart(str, delim);
+ return stripEnd(str, delim);
}
/**
@@ -1403,9 +1251,8 @@ public static String strip( String str, String delim )
* @param strs the Strings to remove whitespace from
* @return the stripped Strings
*/
- public static String[] stripAll( String[] strs )
- {
- return stripAll( strs, null );
+ public static String[] stripAll(String[] strs) {
+ return stripAll(strs, null);
}
/**
@@ -1417,17 +1264,14 @@ public static String[] stripAll( String[] strs )
* @param delimiter the String to remove at start and end
* @return the stripped Strings
*/
- public static String[] stripAll( String[] strs, String delimiter )
- {
- if ( ( strs == null ) || ( strs.length == 0 ) )
- {
+ public static String[] stripAll(String[] strs, String delimiter) {
+ if ((strs == null) || (strs.length == 0)) {
return strs;
}
int sz = strs.length;
String[] newArr = new String[sz];
- for ( int i = 0; i < sz; i++ )
- {
- newArr[i] = strip( strs[i], delimiter );
+ for (int i = 0; i < sz; i++) {
+ newArr[i] = strip(strs[i], delimiter);
}
return newArr;
}
@@ -1444,29 +1288,22 @@ public static String[] stripAll( String[] strs, String delimiter )
* @param strip the String to remove
* @return the stripped String
*/
- public static String stripEnd( String str, String strip )
- {
- if ( str == null )
- {
+ public static String stripEnd(String str, String strip) {
+ if (str == null) {
return null;
}
int end = str.length();
- if ( strip == null )
- {
- while ( ( end != 0 ) && Character.isWhitespace( str.charAt( end - 1 ) ) )
- {
+ if (strip == null) {
+ while ((end != 0) && Character.isWhitespace(str.charAt(end - 1))) {
end--;
}
- }
- else
- {
- while ( ( end != 0 ) && ( strip.indexOf( str.charAt( end - 1 ) ) != -1 ) )
- {
+ } else {
+ while ((end != 0) && (strip.indexOf(str.charAt(end - 1)) != -1)) {
end--;
}
}
- return str.substring( 0, end );
+ return str.substring(0, end);
}
/**
@@ -1481,10 +1318,8 @@ public static String stripEnd( String str, String strip )
* @param strip the String to remove
* @return the stripped String
*/
- public static String stripStart( String str, String strip )
- {
- if ( str == null )
- {
+ public static String stripStart(String str, String strip) {
+ if (str == null) {
return null;
}
@@ -1492,21 +1327,16 @@ public static String stripStart( String str, String strip )
int sz = str.length();
- if ( strip == null )
- {
- while ( ( start != sz ) && Character.isWhitespace( str.charAt( start ) ) )
- {
+ if (strip == null) {
+ while ((start != sz) && Character.isWhitespace(str.charAt(start))) {
start++;
}
- }
- else
- {
- while ( ( start != sz ) && ( strip.indexOf( str.charAt( start ) ) != -1 ) )
- {
+ } else {
+ while ((start != sz) && (strip.indexOf(str.charAt(start)) != -1)) {
start++;
}
}
- return str.substring( start );
+ return str.substring(start);
}
// Case conversion
@@ -1520,10 +1350,8 @@ public static String stripStart( String str, String strip )
* @param str the String to uppercase
* @return the upper cased String
*/
- public static String upperCase( String str )
- {
- if ( str == null )
- {
+ public static String upperCase(String str) {
+ if (str == null) {
return null;
}
return str.toUpperCase();
@@ -1537,10 +1365,8 @@ public static String upperCase( String str )
* @param str the string to lowercase
* @return the lower cased String
*/
- public static String lowerCase( String str )
- {
- if ( str == null )
- {
+ public static String lowerCase(String str) {
+ if (str == null) {
return null;
}
return str.toLowerCase();
@@ -1557,20 +1383,16 @@ public static String lowerCase( String str )
* @param str the String to uncapitalise
* @return uncapitalised String
*/
- public static String uncapitalise( String str )
- {
- if ( str == null )
- {
+ public static String uncapitalise(String str) {
+ if (str == null) {
return null;
- }
- else if ( str.length() == 0 )
- {
+ } else if (str.length() == 0) {
return "";
- }
- else
- {
- return new StringBuilder( str.length() ).append( Character.toLowerCase( str.charAt( 0 ) ) ).append( str, 1,
- str.length() ).toString();
+ } else {
+ return new StringBuilder(str.length())
+ .append(Character.toLowerCase(str.charAt(0)))
+ .append(str, 1, str.length())
+ .toString();
}
}
@@ -1585,20 +1407,16 @@ else if ( str.length() == 0 )
* @param str the String to capitalise
* @return capitalised String
*/
- public static String capitalise( String str )
- {
- if ( str == null )
- {
+ public static String capitalise(String str) {
+ if (str == null) {
return null;
- }
- else if ( str.length() == 0 )
- {
+ } else if (str.length() == 0) {
return "";
- }
- else
- {
- return new StringBuilder( str.length() ).append( Character.toTitleCase( str.charAt( 0 ) ) ).append( str, 1,
- str.length() ).toString();
+ } else {
+ return new StringBuilder(str.length())
+ .append(Character.toTitleCase(str.charAt(0)))
+ .append(str, 1, str.length())
+ .toString();
}
}
@@ -1616,47 +1434,34 @@ else if ( str.length() == 0 )
* @param str the String to swap the case of
* @return the modified String
*/
- public static String swapCase( String str )
- {
- if ( str == null )
- {
+ public static String swapCase(String str) {
+ if (str == null) {
return null;
}
int sz = str.length();
- StringBuilder buffer = new StringBuilder( sz );
+ StringBuilder buffer = new StringBuilder(sz);
boolean whitespace = false;
char ch;
char tmp;
- for ( int i = 0; i < sz; i++ )
- {
- ch = str.charAt( i );
- if ( Character.isUpperCase( ch ) )
- {
- tmp = Character.toLowerCase( ch );
- }
- else if ( Character.isTitleCase( ch ) )
- {
- tmp = Character.toLowerCase( ch );
- }
- else if ( Character.isLowerCase( ch ) )
- {
- if ( whitespace )
- {
- tmp = Character.toTitleCase( ch );
- }
- else
- {
- tmp = Character.toUpperCase( ch );
+ for (int i = 0; i < sz; i++) {
+ ch = str.charAt(i);
+ if (Character.isUpperCase(ch)) {
+ tmp = Character.toLowerCase(ch);
+ } else if (Character.isTitleCase(ch)) {
+ tmp = Character.toLowerCase(ch);
+ } else if (Character.isLowerCase(ch)) {
+ if (whitespace) {
+ tmp = Character.toTitleCase(ch);
+ } else {
+ tmp = Character.toUpperCase(ch);
}
- }
- else
- {
+ } else {
tmp = ch;
}
- buffer.append( tmp );
- whitespace = Character.isWhitespace( ch );
+ buffer.append(tmp);
+ whitespace = Character.isWhitespace(ch);
}
return buffer.toString();
}
@@ -1675,31 +1480,23 @@ else if ( Character.isLowerCase( ch ) )
* @param str the String to capitalise
* @return capitalised String
*/
- public static String capitaliseAllWords( String str )
- {
- if ( str == null )
- {
+ public static String capitaliseAllWords(String str) {
+ if (str == null) {
return null;
}
int sz = str.length();
- StringBuilder buffer = new StringBuilder( sz );
+ StringBuilder buffer = new StringBuilder(sz);
boolean space = true;
- for ( int i = 0; i < sz; i++ )
- {
- char ch = str.charAt( i );
- if ( Character.isWhitespace( ch ) )
- {
- buffer.append( ch );
+ for (int i = 0; i < sz; i++) {
+ char ch = str.charAt(i);
+ if (Character.isWhitespace(ch)) {
+ buffer.append(ch);
space = true;
- }
- else if ( space )
- {
- buffer.append( Character.toTitleCase( ch ) );
+ } else if (space) {
+ buffer.append(Character.toTitleCase(ch));
space = false;
- }
- else
- {
- buffer.append( ch );
+ } else {
+ buffer.append(ch);
}
}
return buffer.toString();
@@ -1719,31 +1516,23 @@ else if ( space )
* @param str the string to uncapitalise
* @return uncapitalised string
*/
- public static String uncapitaliseAllWords( String str )
- {
- if ( str == null )
- {
+ public static String uncapitaliseAllWords(String str) {
+ if (str == null) {
return null;
}
int sz = str.length();
- StringBuilder buffer = new StringBuilder( sz );
+ StringBuilder buffer = new StringBuilder(sz);
boolean space = true;
- for ( int i = 0; i < sz; i++ )
- {
- char ch = str.charAt( i );
- if ( Character.isWhitespace( ch ) )
- {
- buffer.append( ch );
+ for (int i = 0; i < sz; i++) {
+ char ch = str.charAt(i);
+ if (Character.isWhitespace(ch)) {
+ buffer.append(ch);
space = true;
- }
- else if ( space )
- {
- buffer.append( Character.toLowerCase( ch ) );
+ } else if (space) {
+ buffer.append(Character.toLowerCase(ch));
space = false;
- }
- else
- {
- buffer.append( ch );
+ } else {
+ buffer.append(ch);
}
}
return buffer.toString();
@@ -1765,9 +1554,8 @@ else if ( space )
* @return the String that was nested, or null
* @throws NullPointerException if tag is null
*/
- public static String getNestedString( String str, String tag )
- {
- return getNestedString( str, tag, tag );
+ public static String getNestedString(String str, String tag) {
+ return getNestedString(str, tag, tag);
}
/**
@@ -1781,19 +1569,15 @@ public static String getNestedString( String str, String tag )
* @return the String that was nested, or null
* @throws NullPointerException if open or close is null
*/
- public static String getNestedString( String str, String open, String close )
- {
- if ( str == null )
- {
+ public static String getNestedString(String str, String open, String close) {
+ if (str == null) {
return null;
}
- int start = str.indexOf( open );
- if ( start != -1 )
- {
- int end = str.indexOf( close, start + open.length() );
- if ( end != -1 )
- {
- return str.substring( start + open.length(), end );
+ int start = str.indexOf(open);
+ if (start != -1) {
+ int end = str.indexOf(close, start + open.length());
+ if (end != -1) {
+ return str.substring(start + open.length(), end);
}
}
return null;
@@ -1812,20 +1596,16 @@ public static String getNestedString( String str, String open, String close )
* @return the number of occurrences, 0 if the String is null
* @throws NullPointerException if sub is null
*/
- public static int countMatches( String str, String sub )
- {
- if ( sub.equals( "" ) )
- {
+ public static int countMatches(String str, String sub) {
+ if (sub.equals("")) {
return 0;
}
- if ( str == null )
- {
+ if (str == null) {
return 0;
}
int count = 0;
int idx = 0;
- while ( ( idx = str.indexOf( sub, idx ) ) != -1 )
- {
+ while ((idx = str.indexOf(sub, idx)) != -1) {
count++;
idx += sub.length();
}
@@ -1846,17 +1626,13 @@ public static int countMatches( String str, String sub )
* @param str the String to check
* @return true if only contains letters, and is non-null
*/
- public static boolean isAlpha( String str )
- {
- if ( str == null )
- {
+ public static boolean isAlpha(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( Character.isLetter( str.charAt( i ) ) == false )
- {
+ for (int i = 0; i < sz; i++) {
+ if (Character.isLetter(str.charAt(i)) == false) {
return false;
}
}
@@ -1874,17 +1650,13 @@ public static boolean isAlpha( String str )
* @param str the String to check
* @return true if only contains whitespace, and is non-null
*/
- public static boolean isWhitespace( String str )
- {
- if ( str == null )
- {
+ public static boolean isWhitespace(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( ( Character.isWhitespace( str.charAt( i ) ) == false ) )
- {
+ for (int i = 0; i < sz; i++) {
+ if ((Character.isWhitespace(str.charAt(i)) == false)) {
return false;
}
}
@@ -1902,17 +1674,13 @@ public static boolean isWhitespace( String str )
* @param str the String to check
* @return true if only contains letters and space, and is non-null
*/
- public static boolean isAlphaSpace( String str )
- {
- if ( str == null )
- {
+ public static boolean isAlphaSpace(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( ( Character.isLetter( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
- {
+ for (int i = 0; i < sz; i++) {
+ if ((Character.isLetter(str.charAt(i)) == false) && (str.charAt(i) != ' ')) {
return false;
}
}
@@ -1930,17 +1698,13 @@ public static boolean isAlphaSpace( String str )
* @param str the String to check
* @return true if only contains letters or digits, and is non-null
*/
- public static boolean isAlphanumeric( String str )
- {
- if ( str == null )
- {
+ public static boolean isAlphanumeric(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( Character.isLetterOrDigit( str.charAt( i ) ) == false )
- {
+ for (int i = 0; i < sz; i++) {
+ if (Character.isLetterOrDigit(str.charAt(i)) == false) {
return false;
}
}
@@ -1958,17 +1722,13 @@ public static boolean isAlphanumeric( String str )
* @param str the String to check
* @return true if only contains letters, digits or space, and is non-null
*/
- public static boolean isAlphanumericSpace( String str )
- {
- if ( str == null )
- {
+ public static boolean isAlphanumericSpace(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( ( Character.isLetterOrDigit( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
- {
+ for (int i = 0; i < sz; i++) {
+ if ((Character.isLetterOrDigit(str.charAt(i)) == false) && (str.charAt(i) != ' ')) {
return false;
}
}
@@ -1986,17 +1746,13 @@ public static boolean isAlphanumericSpace( String str )
* @param str the String to check
* @return true if only contains digits, and is non-null
*/
- public static boolean isNumeric( String str )
- {
- if ( str == null )
- {
+ public static boolean isNumeric(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( Character.isDigit( str.charAt( i ) ) == false )
- {
+ for (int i = 0; i < sz; i++) {
+ if (Character.isDigit(str.charAt(i)) == false) {
return false;
}
}
@@ -2014,17 +1770,13 @@ public static boolean isNumeric( String str )
* @param str the String to check
* @return true if only contains digits or space, and is non-null
*/
- public static boolean isNumericSpace( String str )
- {
- if ( str == null )
- {
+ public static boolean isNumericSpace(String str) {
+ if (str == null) {
return false;
}
int sz = str.length();
- for ( int i = 0; i < sz; i++ )
- {
- if ( ( Character.isDigit( str.charAt( i ) ) == false ) && ( str.charAt( i ) != ' ' ) )
- {
+ for (int i = 0; i < sz; i++) {
+ if ((Character.isDigit(str.charAt(i)) == false) && (str.charAt(i) != ' ')) {
return false;
}
}
@@ -2045,9 +1797,8 @@ public static boolean isNumericSpace( String str )
* @see Objects#toString(Object, String)
*/
@Deprecated
- public static String defaultString( Object obj )
- {
- return defaultString( obj, "" );
+ public static String defaultString(Object obj) {
+ return defaultString(obj, "");
}
/**
@@ -2062,9 +1813,8 @@ public static String defaultString( Object obj )
* @see Objects#toString(Object, String)
*/
@Deprecated
- public static String defaultString( Object obj, String defaultString )
- {
- return Objects.toString( obj, defaultString );
+ public static String defaultString(Object obj, String defaultString) {
+ return Objects.toString(obj, defaultString);
}
// Reversing
@@ -2081,13 +1831,11 @@ public static String defaultString( Object obj, String defaultString )
* @param str the String to reverse
* @return the reversed String
*/
- public static String reverse( String str )
- {
- if ( str == null )
- {
+ public static String reverse(String str) {
+ if (str == null) {
return null;
}
- return new StringBuilder( str ).reverse().toString();
+ return new StringBuilder(str).reverse().toString();
}
/**
@@ -2103,13 +1851,12 @@ public static String reverse( String str )
* @param delimiter the delimiter to use
* @return the reversed String
*/
- public static String reverseDelimitedString( String str, String delimiter )
- {
+ public static String reverseDelimitedString(String str, String delimiter) {
// could implement manually, but simple way is to reuse other,
// probably slower, methods.
- String[] strs = split( str, delimiter );
- reverseArray( strs );
- return join( strs, delimiter );
+ String[] strs = split(str, delimiter);
+ reverseArray(strs);
+ return join(strs, delimiter);
}
/**
@@ -2122,14 +1869,12 @@ public static String reverseDelimitedString( String str, String delimiter )
*
* @param array the array to reverse
*/
- private static void reverseArray( Object[] array )
- {
+ private static void reverseArray(Object[] array) {
int i = 0;
int j = array.length - 1;
Object tmp;
- while ( j > i )
- {
+ while (j > i) {
tmp = array[j];
array[j] = array[i];
array[i] = tmp;
@@ -2152,9 +1897,8 @@ private static void reverseArray( Object[] array )
* @param s string
* @param maxWidth maximum length of result string
**/
- public static String abbreviate( String s, int maxWidth )
- {
- return abbreviate( s, 0, maxWidth );
+ public static String abbreviate(String s, int maxWidth) {
+ return abbreviate(s, 0, maxWidth);
}
/**
@@ -2167,37 +1911,29 @@ public static String abbreviate( String s, int maxWidth )
* @param offset left edge of source string
* @param maxWidth maximum length of result string
**/
- public static String abbreviate( String s, int offset, int maxWidth )
- {
- if ( maxWidth < 4 )
- {
- throw new IllegalArgumentException( "Minimum abbreviation width is 4" );
- }
- if ( s.length() <= maxWidth )
- {
+ public static String abbreviate(String s, int offset, int maxWidth) {
+ if (maxWidth < 4) {
+ throw new IllegalArgumentException("Minimum abbreviation width is 4");
+ }
+ if (s.length() <= maxWidth) {
return s;
}
- if ( offset > s.length() )
- {
+ if (offset > s.length()) {
offset = s.length();
}
- if ( ( s.length() - offset ) < ( maxWidth - 3 ) )
- {
- offset = s.length() - ( maxWidth - 3 );
+ if ((s.length() - offset) < (maxWidth - 3)) {
+ offset = s.length() - (maxWidth - 3);
}
- if ( offset <= 4 )
- {
- return s.substring( 0, maxWidth - 3 ) + "...";
+ if (offset <= 4) {
+ return s.substring(0, maxWidth - 3) + "...";
}
- if ( maxWidth < 7 )
- {
- throw new IllegalArgumentException( "Minimum abbreviation width with offset is 7" );
+ if (maxWidth < 7) {
+ throw new IllegalArgumentException("Minimum abbreviation width with offset is 7");
}
- if ( ( offset + ( maxWidth - 3 ) ) < s.length() )
- {
- return "..." + abbreviate( s.substring( offset ), maxWidth - 3 );
+ if ((offset + (maxWidth - 3)) < s.length()) {
+ return "..." + abbreviate(s.substring(offset), maxWidth - 3);
}
- return "..." + s.substring( s.length() - ( maxWidth - 3 ) );
+ return "..." + s.substring(s.length() - (maxWidth - 3));
}
// Difference
@@ -2212,14 +1948,12 @@ public static String abbreviate( String s, int offset, int maxWidth )
* @param s2 string
* @return the portion of s2 where it differs from s1; returns the empty string ("") if they are equal
**/
- public static String difference( String s1, String s2 )
- {
- int at = differenceAt( s1, s2 );
- if ( at == -1 )
- {
+ public static String difference(String s1, String s2) {
+ int at = differenceAt(s1, s2);
+ if (at == -1) {
return "";
}
- return s2.substring( at );
+ return s2.substring(at);
}
/**
@@ -2231,103 +1965,88 @@ public static String difference( String s1, String s2 )
* @param s2 string
* @return the index where s2 and s1 begin to differ; -1 if they are equal
**/
- public static int differenceAt( String s1, String s2 )
- {
+ public static int differenceAt(String s1, String s2) {
int i;
- for ( i = 0; ( i < s1.length() ) && ( i < s2.length() ); ++i )
- {
- if ( s1.charAt( i ) != s2.charAt( i ) )
- {
+ for (i = 0; (i < s1.length()) && (i < s2.length()); ++i) {
+ if (s1.charAt(i) != s2.charAt(i)) {
break;
}
}
- if ( ( i < s2.length() ) || ( i < s1.length() ) )
- {
+ if ((i < s2.length()) || (i < s1.length())) {
return i;
}
return -1;
}
- public static String interpolate( String text, Map namespace )
- {
+ public static String interpolate(String text, Map namespace) {
Iterator keys = namespace.keySet().iterator();
- while ( keys.hasNext() )
- {
+ while (keys.hasNext()) {
String key = keys.next().toString();
- Object obj = namespace.get( key );
+ Object obj = namespace.get(key);
- if ( obj == null )
- {
- throw new NullPointerException( "The value of the key '" + key + "' is null." );
+ if (obj == null) {
+ throw new NullPointerException("The value of the key '" + key + "' is null.");
}
String value = obj.toString();
- text = replace( text, "${" + key + "}", value );
+ text = replace(text, "${" + key + "}", value);
- if ( !key.contains( " " ) )
- {
- text = replace( text, "$" + key, value );
+ if (!key.contains(" ")) {
+ text = replace(text, "$" + key, value);
}
}
return text;
}
- public static String removeAndHump( String data, String replaceThis )
- {
+ public static String removeAndHump(String data, String replaceThis) {
String temp;
StringBuilder out = new StringBuilder();
temp = data;
- StringTokenizer st = new StringTokenizer( temp, replaceThis );
+ StringTokenizer st = new StringTokenizer(temp, replaceThis);
- while ( st.hasMoreTokens() )
- {
+ while (st.hasMoreTokens()) {
String element = (String) st.nextElement();
- out.append( capitalizeFirstLetter( element ) );
+ out.append(capitalizeFirstLetter(element));
}
return out.toString();
}
- public static String capitalizeFirstLetter( String data )
- {
- char firstLetter = Character.toTitleCase( data.substring( 0, 1 ).charAt( 0 ) );
+ public static String capitalizeFirstLetter(String data) {
+ char firstLetter = Character.toTitleCase(data.substring(0, 1).charAt(0));
- String restLetters = data.substring( 1 );
+ String restLetters = data.substring(1);
return firstLetter + restLetters;
}
- public static String lowercaseFirstLetter( String data )
- {
- char firstLetter = Character.toLowerCase( data.substring( 0, 1 ).charAt( 0 ) );
+ public static String lowercaseFirstLetter(String data) {
+ char firstLetter = Character.toLowerCase(data.substring(0, 1).charAt(0));
- String restLetters = data.substring( 1 );
+ String restLetters = data.substring(1);
return firstLetter + restLetters;
}
- public static String addAndDeHump( String view )
- {
+ public static String addAndDeHump(String view) {
StringBuilder sb = new StringBuilder();
- for ( int i = 0; i < view.length(); i++ )
- {
- if ( ( i != 0 ) && Character.isUpperCase( view.charAt( i ) ) )
- {
- sb.append( '-' );
+ for (int i = 0; i < view.length(); i++) {
+ if ((i != 0) && Character.isUpperCase(view.charAt(i))) {
+ sb.append('-');
}
- sb.append( view.charAt( i ) );
+ sb.append(view.charAt(i));
}
- return sb.toString().trim().toLowerCase( Locale.ENGLISH );
+ return sb.toString().trim().toLowerCase(Locale.ENGLISH);
}
/**
@@ -2349,9 +2068,8 @@ public static String addAndDeHump( String view )
* @since 1.5.1
* @see #quoteAndEscape(String, char, char[], char[], char, boolean)
*/
- public static String quoteAndEscape( String source, char quoteChar )
- {
- return quoteAndEscape( source, quoteChar, new char[] { quoteChar }, new char[] { ' ' }, '\\', false );
+ public static String quoteAndEscape(String source, char quoteChar) {
+ return quoteAndEscape(source, quoteChar, new char[] {quoteChar}, new char[] {' '}, '\\', false);
}
/**
@@ -2366,9 +2084,8 @@ public static String quoteAndEscape( String source, char quoteChar )
* @since 1.5.1
* @see #quoteAndEscape(String, char, char[], char[], char, boolean)
*/
- public static String quoteAndEscape( String source, char quoteChar, char[] quotingTriggers )
- {
- return quoteAndEscape( source, quoteChar, new char[] { quoteChar }, quotingTriggers, '\\', false );
+ public static String quoteAndEscape(String source, char quoteChar, char[] quotingTriggers) {
+ return quoteAndEscape(source, quoteChar, new char[] {quoteChar}, quotingTriggers, '\\', false);
}
/**
@@ -2381,10 +2098,9 @@ public static String quoteAndEscape( String source, char quoteChar, char[] quoti
* @since 1.5.1
* @see #quoteAndEscape(String, char, char[], char[], char, boolean)
*/
- public static String quoteAndEscape( String source, char quoteChar, final char[] escapedChars, char escapeChar,
- boolean force )
- {
- return quoteAndEscape( source, quoteChar, escapedChars, new char[] { ' ' }, escapeChar, force );
+ public static String quoteAndEscape(
+ String source, char quoteChar, final char[] escapedChars, char escapeChar, boolean force) {
+ return quoteAndEscape(source, quoteChar, escapedChars, new char[] {' '}, escapeChar, force);
}
/**
@@ -2397,10 +2113,14 @@ public static String quoteAndEscape( String source, char quoteChar, final char[]
* @return the String quoted and escaped
* @since 1.5.1
*/
- public static String quoteAndEscape( String source, char quoteChar, final char[] escapedChars,
- final char[] quotingTriggers, char escapeChar, boolean force )
- {
- return quoteAndEscape( source, quoteChar, escapedChars, quotingTriggers, escapeChar + "%s", force );
+ public static String quoteAndEscape(
+ String source,
+ char quoteChar,
+ final char[] escapedChars,
+ final char[] quotingTriggers,
+ char escapeChar,
+ boolean force) {
+ return quoteAndEscape(source, quoteChar, escapedChars, quotingTriggers, escapeChar + "%s", force);
}
/**
@@ -2413,45 +2133,40 @@ public static String quoteAndEscape( String source, char quoteChar, final char[]
* @return the String quoted and escaped
* @since 3.0.4
*/
- public static String quoteAndEscape( String source, char quoteChar, final char[] escapedChars,
- final char[] quotingTriggers, String escapePattern, boolean force )
- {
- if ( source == null )
- {
+ public static String quoteAndEscape(
+ String source,
+ char quoteChar,
+ final char[] escapedChars,
+ final char[] quotingTriggers,
+ String escapePattern,
+ boolean force) {
+ if (source == null) {
return null;
}
- if ( !force && source.startsWith( Character.toString( quoteChar ) )
- && source.endsWith( Character.toString( quoteChar ) ) )
- {
+ if (!force
+ && source.startsWith(Character.toString(quoteChar))
+ && source.endsWith(Character.toString(quoteChar))) {
return source;
}
- String escaped = escape( source, escapedChars, escapePattern );
+ String escaped = escape(source, escapedChars, escapePattern);
boolean quote = false;
- if ( force )
- {
+ if (force) {
quote = true;
- }
- else if ( !escaped.equals( source ) )
- {
+ } else if (!escaped.equals(source)) {
quote = true;
- }
- else
- {
- for ( char quotingTrigger : quotingTriggers )
- {
- if ( escaped.indexOf( quotingTrigger ) > -1 )
- {
+ } else {
+ for (char quotingTrigger : quotingTriggers) {
+ if (escaped.indexOf(quotingTrigger) > -1) {
quote = true;
break;
}
}
}
- if ( quote )
- {
+ if (quote) {
return quoteChar + escaped + quoteChar;
}
@@ -2465,9 +2180,8 @@ else if ( !escaped.equals( source ) )
* @return the String escaped
* @since 1.5.1
*/
- public static String escape( String source, final char[] escapedChars, char escapeChar )
- {
- return escape( source, escapedChars, escapeChar + "%s" );
+ public static String escape(String source, final char[] escapedChars, char escapeChar) {
+ return escape(source, escapedChars, escapeChar + "%s");
}
/**
@@ -2477,31 +2191,25 @@ public static String escape( String source, final char[] escapedChars, char esca
* @return the String escaped
* @since 3.0.4
*/
- public static String escape( String source, final char[] escapedChars, String escapePattern )
- {
- if ( source == null )
- {
+ public static String escape(String source, final char[] escapedChars, String escapePattern) {
+ if (source == null) {
return null;
}
char[] eqc = new char[escapedChars.length];
- System.arraycopy( escapedChars, 0, eqc, 0, escapedChars.length );
- Arrays.sort( eqc );
+ System.arraycopy(escapedChars, 0, eqc, 0, escapedChars.length);
+ Arrays.sort(eqc);
- StringBuilder buffer = new StringBuilder( source.length() );
+ StringBuilder buffer = new StringBuilder(source.length());
- for ( int i = 0; i < source.length(); i++ )
- {
- final char c = source.charAt( i );
- int result = Arrays.binarySearch( eqc, c );
+ for (int i = 0; i < source.length(); i++) {
+ final char c = source.charAt(i);
+ int result = Arrays.binarySearch(eqc, c);
- if ( result > -1 )
- {
- buffer.append( String.format( escapePattern, c ) );
- }
- else
- {
- buffer.append( c );
+ if (result > -1) {
+ buffer.append(String.format(escapePattern, c));
+ } else {
+ buffer.append(c);
}
}
@@ -2515,18 +2223,15 @@ public static String escape( String source, final char[] escapedChars, String es
* @return a string with unique whitespace.
* @since 1.5.7
*/
- public static String removeDuplicateWhitespace( String s )
- {
+ public static String removeDuplicateWhitespace(String s) {
StringBuilder result = new StringBuilder();
int length = s.length();
boolean isPreviousWhiteSpace = false;
- for ( int i = 0; i < length; i++ )
- {
- char c = s.charAt( i );
- boolean thisCharWhiteSpace = Character.isWhitespace( c );
- if ( !( isPreviousWhiteSpace && thisCharWhiteSpace ) )
- {
- result.append( c );
+ for (int i = 0; i < length; i++) {
+ char c = s.charAt(i);
+ boolean thisCharWhiteSpace = Character.isWhitespace(c);
+ if (!(isPreviousWhiteSpace && thisCharWhiteSpace)) {
+ result.append(c);
}
isPreviousWhiteSpace = thisCharWhiteSpace;
}
@@ -2541,9 +2246,8 @@ public static String removeDuplicateWhitespace( String s )
* @see #unifyLineSeparators(String, String)
* @since 1.5.7
*/
- public static String unifyLineSeparators( String s )
- {
- return unifyLineSeparators( s, System.getProperty( "line.separator" ) );
+ public static String unifyLineSeparators(String s) {
+ return unifyLineSeparators(s, System.getProperty("line.separator"));
}
/**
@@ -2555,44 +2259,33 @@ public static String unifyLineSeparators( String s )
* @throws IllegalArgumentException if ls is not '\n', '\r' and '\r\n' characters.
* @since 1.5.7
*/
- public static String unifyLineSeparators( String s, String ls )
- {
- if ( s == null )
- {
+ public static String unifyLineSeparators(String s, String ls) {
+ if (s == null) {
return null;
}
- if ( ls == null )
- {
- ls = System.getProperty( "line.separator" );
+ if (ls == null) {
+ ls = System.getProperty("line.separator");
}
- if ( !( ls.equals( "\n" ) || ls.equals( "\r" ) || ls.equals( "\r\n" ) ) )
- {
- throw new IllegalArgumentException( "Requested line separator is invalid." );
+ if (!(ls.equals("\n") || ls.equals("\r") || ls.equals("\r\n"))) {
+ throw new IllegalArgumentException("Requested line separator is invalid.");
}
int length = s.length();
- StringBuilder buffer = new StringBuilder( length );
- for ( int i = 0; i < length; i++ )
- {
- if ( s.charAt( i ) == '\r' )
- {
- if ( ( i + 1 ) < length && s.charAt( i + 1 ) == '\n' )
- {
+ StringBuilder buffer = new StringBuilder(length);
+ for (int i = 0; i < length; i++) {
+ if (s.charAt(i) == '\r') {
+ if ((i + 1) < length && s.charAt(i + 1) == '\n') {
i++;
}
- buffer.append( ls );
- }
- else if ( s.charAt( i ) == '\n' )
- {
- buffer.append( ls );
- }
- else
- {
- buffer.append( s.charAt( i ) );
+ buffer.append(ls);
+ } else if (s.charAt(i) == '\n') {
+ buffer.append(ls);
+ } else {
+ buffer.append(s.charAt(i));
}
}
@@ -2620,13 +2313,11 @@ else if ( s.charAt( i ) == '\n' )
* @return true if the String contains the search character, false if not or null string input
* @since 1.5.7
*/
- public static boolean contains( String str, char searchChar )
- {
- if ( isEmpty( str ) )
- {
+ public static boolean contains(String str, char searchChar) {
+ if (isEmpty(str)) {
return false;
}
- return str.indexOf( searchChar ) >= 0;
+ return str.indexOf(searchChar) >= 0;
}
/**
@@ -2652,12 +2343,10 @@ public static boolean contains( String str, char searchChar )
* @return true if the String contains the search String, false if not or null string input
* @since 1.5.7
*/
- public static boolean contains( String str, String searchStr )
- {
- if ( str == null || searchStr == null )
- {
+ public static boolean contains(String str, String searchStr) {
+ if (str == null || searchStr == null) {
return false;
}
- return str.contains( searchStr );
+ return str.contains(searchStr);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/SweeperPool.java b/src/main/java/org/codehaus/plexus/util/SweeperPool.java
index 0a2a97a4..2070b9b8 100644
--- a/src/main/java/org/codehaus/plexus/util/SweeperPool.java
+++ b/src/main/java/org/codehaus/plexus/util/SweeperPool.java
@@ -25,8 +25,7 @@
* @author Bert van Brakel
*
*/
-public class SweeperPool
-{
+public class SweeperPool {
/***/
private static final boolean DEBUG = false;
@@ -66,41 +65,34 @@ public class SweeperPool
* @param intialCapacity the intial capacity
* Any value less than 0 is automatically converted to 0
*/
- public SweeperPool( int maxSize, int minSize, int intialCapacity, int sweepInterval, int triggerSize )
- {
+ public SweeperPool(int maxSize, int minSize, int intialCapacity, int sweepInterval, int triggerSize) {
super();
- this.maxSize = saneConvert( maxSize );
- this.minSize = saneConvert( minSize );
- this.triggerSize = saneConvert( triggerSize );
- pooledObjects = new ArrayList( intialCapacity );
+ this.maxSize = saneConvert(maxSize);
+ this.minSize = saneConvert(minSize);
+ this.triggerSize = saneConvert(triggerSize);
+ pooledObjects = new ArrayList(intialCapacity);
// only run a sweeper if sweep interval is positive
- if ( sweepInterval > 0 )
- {
- sweeper = new Sweeper( this, sweepInterval );
+ if (sweepInterval > 0) {
+ sweeper = new Sweeper(this, sweepInterval);
sweeper.start();
}
}
- private int saneConvert( int value )
- {
- return Math.max( value, 0 );
+ private int saneConvert(int value) {
+ return Math.max(value, 0);
}
/**
* Return the pooled object
* @return first available object from the pool
*/
- public synchronized Object get()
- {
- if ( ( pooledObjects.size() == 0 ) || shuttingDown )
- {
+ public synchronized Object get() {
+ if ((pooledObjects.size() == 0) || shuttingDown) {
return null;
- }
- else
- {
- Object obj = pooledObjects.remove( 0 );
- objectRetrieved( obj );
+ } else {
+ Object obj = pooledObjects.remove(0);
+ objectRetrieved(obj);
// used.add(obj);
return obj;
@@ -113,20 +105,16 @@ public synchronized Object get()
* @param obj the object to pool. Can be null.
* @return true if the object was added to the pool, false if it was disposed or null
*/
- public synchronized boolean put( Object obj )
- {
- objectAdded( obj );
+ public synchronized boolean put(Object obj) {
+ objectAdded(obj);
- if ( ( obj != null ) && ( pooledObjects.size() < maxSize ) && ( shuttingDown == false ) )
- {
- pooledObjects.add( obj );
+ if ((obj != null) && (pooledObjects.size() < maxSize) && (shuttingDown == false)) {
+ pooledObjects.add(obj);
return true;
- }
- else if ( obj != null )
- {
+ } else if (obj != null) {
// no longer need the object, so dispose it
- objectDisposed( obj );
+ objectDisposed(obj);
}
return false;
@@ -137,41 +125,33 @@ else if ( obj != null )
*
* @return the number of pooled objects
*/
- public synchronized int getSize()
- {
+ public synchronized int getSize() {
return pooledObjects.size();
}
/**
* Dispose of this pool. Stops the sweeper and disposes each object in the pool
*/
- public void dispose()
- {
+ public void dispose() {
shuttingDown = true;
- if ( sweeper != null )
- {
+ if (sweeper != null) {
sweeper.stop();
- try
- {
+ try {
sweeper.join();
- }
- catch ( InterruptedException e )
- {
- System.err.println( "Unexpected exception occurred: " );
+ } catch (InterruptedException e) {
+ System.err.println("Unexpected exception occurred: ");
e.printStackTrace();
}
}
- synchronized ( this )
- {
+ synchronized (this) {
// use an array here as objects may still be being put back in the pool
// and we don't want to throw a ConcurrentModificationException
Object[] objects = pooledObjects.toArray();
- for ( Object object : objects )
- {
- objectDisposed( object );
+ for (Object object : objects) {
+ objectDisposed(object);
}
pooledObjects.clear();
@@ -183,16 +163,13 @@ public void dispose()
*
* @return true if the pool has been disposed, false otherwise
*/
- boolean isDisposed()
- {
- if ( !shuttingDown )
- {
+ boolean isDisposed() {
+ if (!shuttingDown) {
return false;
}
// A null sweeper means one was never started.
- if ( sweeper == null )
- {
+ if (sweeper == null) {
return true;
}
@@ -202,14 +179,11 @@ boolean isDisposed()
/**
* Trim the pool down to min size
*/
- public synchronized void trim()
- {
- if ( ( ( triggerSize > 0 ) && ( pooledObjects.size() >= triggerSize ) )
- || ( ( maxSize > 0 ) && ( pooledObjects.size() >= maxSize ) ) )
- {
- while ( pooledObjects.size() > minSize )
- {
- objectDisposed( pooledObjects.remove( 0 ) );
+ public synchronized void trim() {
+ if (((triggerSize > 0) && (pooledObjects.size() >= triggerSize))
+ || ((maxSize > 0) && (pooledObjects.size() >= maxSize))) {
+ while (pooledObjects.size() > minSize) {
+ objectDisposed(pooledObjects.remove(0));
}
}
}
@@ -220,18 +194,14 @@ public synchronized void trim()
*
* @param obj the Object
*/
- public void objectDisposed( Object obj )
- {
- }
+ public void objectDisposed(Object obj) {}
/**
* Override this to be notified of object addition. Called before object is to be added.
*
* @param obj the Object
*/
- public void objectAdded( Object obj )
- {
- }
+ public void objectAdded(Object obj) {}
/**
* Override this to be notified of object retrieval. Called after object removed from the pool, but before returned
@@ -239,18 +209,14 @@ public void objectAdded( Object obj )
*
* @param obj the Object
*/
- public void objectRetrieved( Object obj )
- {
- }
+ public void objectRetrieved(Object obj) {}
/**
* Periodically at sweepInterval goes through and tests if the pool should be trimmed.
*
* @author bert
*/
- private static class Sweeper
- implements Runnable
- {
+ private static class Sweeper implements Runnable {
private final transient SweeperPool pool;
private transient boolean service = false;
@@ -262,8 +228,7 @@ private static class Sweeper
/**
*
*/
- public Sweeper( SweeperPool pool, int sweepInterval )
- {
+ public Sweeper(SweeperPool pool, int sweepInterval) {
super();
this.sweepInterval = sweepInterval;
this.pool = pool;
@@ -275,72 +240,56 @@ public Sweeper( SweeperPool pool, int sweepInterval )
* @see java.lang.Runnable#run()
*/
@Override
- public void run()
- {
- debug( "started" );
-
- if ( sweepInterval > 0 )
- {
- synchronized ( this )
- {
- while ( service )
- {
- try
- {
+ public void run() {
+ debug("started");
+
+ if (sweepInterval > 0) {
+ synchronized (this) {
+ while (service) {
+ try {
// wait specified number of seconds
// before running next sweep
- wait( sweepInterval * 1000 );
- }
- catch ( InterruptedException e )
- {
+ wait(sweepInterval * 1000);
+ } catch (InterruptedException e) {
}
runSweep();
}
}
}
- debug( "stopped" );
+ debug("stopped");
}
- public void start()
- {
- if ( !service )
- {
+ public void start() {
+ if (!service) {
service = true;
- t = new Thread( this );
- t.setName( "Sweeper" );
+ t = new Thread(this);
+ t.setName("Sweeper");
t.start();
}
}
- public synchronized void stop()
- {
+ public synchronized void stop() {
service = false;
notifyAll();
}
- void join()
- throws InterruptedException
- {
+ void join() throws InterruptedException {
t.join();
}
- boolean hasStopped()
- {
+ boolean hasStopped() {
return !service && !t.isAlive();
}
- private final void debug( String msg )
- {
- if ( DEBUG )
- {
- System.err.println( this + ":" + msg );
+ private final void debug(String msg) {
+ if (DEBUG) {
+ System.err.println(this + ":" + msg);
}
}
- private void runSweep()
- {
- debug( "runningSweep. time=" + System.currentTimeMillis() );
+ private void runSweep() {
+ debug("runningSweep. time=" + System.currentTimeMillis());
pool.trim();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/TypeFormat.java b/src/main/java/org/codehaus/plexus/util/TypeFormat.java
index f950003b..e4fc64b7 100644
--- a/src/main/java/org/codehaus/plexus/util/TypeFormat.java
+++ b/src/main/java/org/codehaus/plexus/util/TypeFormat.java
@@ -16,7 +16,7 @@
*
* For class instances, formatting is typically performed using specialized java.text.Format
* (Locale sensitive) and/or using conventional methods (class sensitive). For example:
- *
+ *
*
* public class Foo {
* public static Foo valueOf(CharSequence chars) {...} // Parses.
@@ -33,21 +33,20 @@
* @author Jean-Marie Dautelle
* @version 4.6, June 22, 2003
*/
-public final class TypeFormat
-{
+public final class TypeFormat {
/**
* Holds the characters used to represent numbers.
*/
- private final static char[] DIGITS = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e',
- 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z' };
+ private static final char[] DIGITS = {
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
+ 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
+ };
/**
* Default constructor (forbids derivation).
*/
- private TypeFormat()
- {
- }
+ private TypeFormat() {}
/**
* Searches for a particular sequence within a character sequence (general purpose parsing function).
@@ -58,38 +57,29 @@ private TypeFormat()
* @return the index in the range [fromIndex, chars.length()-pattern.length()] or -1 if
* the character sequence is not found.
*/
- public static int indexOf( CharSequence pattern, CharSequence chars, int fromIndex )
- {
+ public static int indexOf(CharSequence pattern, CharSequence chars, int fromIndex) {
int patternLength = pattern.length();
- fromIndex = Math.max( 0, fromIndex );
- if ( patternLength != 0 )
- { // At least one character to search for.
- char firstChar = pattern.charAt( 0 );
+ fromIndex = Math.max(0, fromIndex);
+ if (patternLength != 0) { // At least one character to search for.
+ char firstChar = pattern.charAt(0);
int last = chars.length() - patternLength;
- for ( int i = fromIndex; i <= last; i++ )
- {
- if ( chars.charAt( i ) == firstChar )
- {
+ for (int i = fromIndex; i <= last; i++) {
+ if (chars.charAt(i) == firstChar) {
boolean match = true;
- for ( int j = 1; j < patternLength; j++ )
- {
- if ( chars.charAt( i + j ) != pattern.charAt( j ) )
- {
+ for (int j = 1; j < patternLength; j++) {
+ if (chars.charAt(i + j) != pattern.charAt(j)) {
match = false;
break;
}
}
- if ( match )
- {
+ if (match) {
return i;
}
}
}
return -1;
- }
- else
- {
- return Math.min( 0, fromIndex );
+ } else {
+ return Math.min(0, fromIndex);
}
}
@@ -99,12 +89,12 @@ public static int indexOf( CharSequence pattern, CharSequence chars, int fromInd
* @param chars the character sequence to parse.
* @return the corresponding boolean.
*/
- public static boolean parseBoolean( CharSequence chars )
- {
- return ( chars.length() == 4 ) && ( chars.charAt( 0 ) == 't' || chars.charAt( 0 ) == 'T' )
- && ( chars.charAt( 1 ) == 'r' || chars.charAt( 1 ) == 'R' )
- && ( chars.charAt( 2 ) == 'u' || chars.charAt( 2 ) == 'U' )
- && ( chars.charAt( 3 ) == 'e' || chars.charAt( 3 ) == 'E' );
+ public static boolean parseBoolean(CharSequence chars) {
+ return (chars.length() == 4)
+ && (chars.charAt(0) == 't' || chars.charAt(0) == 'T')
+ && (chars.charAt(1) == 'r' || chars.charAt(1) == 'R')
+ && (chars.charAt(2) == 'u' || chars.charAt(2) == 'U')
+ && (chars.charAt(3) == 'e' || chars.charAt(3) == 'E');
}
/**
@@ -115,9 +105,8 @@ public static boolean parseBoolean( CharSequence chars )
* @throws NumberFormatException if the specified character sequence does not contain a parsable short.
* @see #parseShort(CharSequence, int)
*/
- public static short parseShort( CharSequence chars )
- {
- return parseShort( chars, 10 );
+ public static short parseShort(CharSequence chars) {
+ return parseShort(chars, 10);
}
/**
@@ -130,36 +119,29 @@ public static short parseShort( CharSequence chars )
* @return the corresponding short.
* @throws NumberFormatException if the specified character sequence does not contain a parsable short.
*/
- public static short parseShort( CharSequence chars, int radix )
- {
- try
- {
- boolean isNegative = ( chars.charAt( 0 ) == '-' ) ? true : false;
+ public static short parseShort(CharSequence chars, int radix) {
+ try {
+ boolean isNegative = (chars.charAt(0) == '-') ? true : false;
int result = 0;
- int limit = ( isNegative ) ? Short.MIN_VALUE : -Short.MAX_VALUE;
+ int limit = (isNegative) ? Short.MIN_VALUE : -Short.MAX_VALUE;
int multmin = limit / radix;
int length = chars.length();
- int i = ( isNegative || ( chars.charAt( 0 ) == '+' ) ) ? 1 : 0;
- while ( true )
- {
- int digit = Character.digit( chars.charAt( i ), radix );
+ int i = (isNegative || (chars.charAt(0) == '+')) ? 1 : 0;
+ while (true) {
+ int digit = Character.digit(chars.charAt(i), radix);
int tmp = result * radix;
- if ( ( digit < 0 ) || ( result < multmin ) || ( tmp < limit + digit ) )
- { // Overflow.
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ if ((digit < 0) || (result < multmin) || (tmp < limit + digit)) { // Overflow.
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
// Accumulates negatively.
result = tmp - digit;
- if ( ++i >= length )
- {
+ if (++i >= length) {
break;
}
}
- return (short) ( isNegative ? result : -result );
- }
- catch ( IndexOutOfBoundsException e )
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ return (short) (isNegative ? result : -result);
+ } catch (IndexOutOfBoundsException e) {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
}
@@ -171,9 +153,8 @@ public static short parseShort( CharSequence chars, int radix )
* @throws NumberFormatException if the specified character sequence does not contain a parsable int.
* @see #parseInt(CharSequence, int)
*/
- public static int parseInt( CharSequence chars )
- {
- return parseInt( chars, 10 );
+ public static int parseInt(CharSequence chars) {
+ return parseInt(chars, 10);
}
/**
@@ -186,36 +167,29 @@ public static int parseInt( CharSequence chars )
* @return the corresponding int.
* @throws NumberFormatException if the specified character sequence does not contain a parsable int.
*/
- public static int parseInt( CharSequence chars, int radix )
- {
- try
- {
- boolean isNegative = ( chars.charAt( 0 ) == '-' ) ? true : false;
+ public static int parseInt(CharSequence chars, int radix) {
+ try {
+ boolean isNegative = (chars.charAt(0) == '-') ? true : false;
int result = 0;
- int limit = ( isNegative ) ? Integer.MIN_VALUE : -Integer.MAX_VALUE;
+ int limit = (isNegative) ? Integer.MIN_VALUE : -Integer.MAX_VALUE;
int multmin = limit / radix;
int length = chars.length();
- int i = ( isNegative || ( chars.charAt( 0 ) == '+' ) ) ? 1 : 0;
- while ( true )
- {
- int digit = Character.digit( chars.charAt( i ), radix );
+ int i = (isNegative || (chars.charAt(0) == '+')) ? 1 : 0;
+ while (true) {
+ int digit = Character.digit(chars.charAt(i), radix);
int tmp = result * radix;
- if ( ( digit < 0 ) || ( result < multmin ) || ( tmp < limit + digit ) )
- { // Overflow.
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ if ((digit < 0) || (result < multmin) || (tmp < limit + digit)) { // Overflow.
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
// Accumulates negatively to avoid surprises near MAX_VALUE
result = tmp - digit;
- if ( ++i >= length )
- {
+ if (++i >= length) {
break;
}
}
return isNegative ? result : -result;
- }
- catch ( IndexOutOfBoundsException e )
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ } catch (IndexOutOfBoundsException e) {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
}
@@ -227,9 +201,8 @@ public static int parseInt( CharSequence chars, int radix )
* @throws NumberFormatException if the specified character sequence does not contain a parsable long.
* @see #parseLong(CharSequence, int)
*/
- public static long parseLong( CharSequence chars )
- {
- return parseLong( chars, 10 );
+ public static long parseLong(CharSequence chars) {
+ return parseLong(chars, 10);
}
/**
@@ -242,36 +215,29 @@ public static long parseLong( CharSequence chars )
* @return the corresponding long.
* @throws NumberFormatException if the specified character sequence does not contain a parsable long.
*/
- public static long parseLong( CharSequence chars, int radix )
- {
- try
- {
- boolean isNegative = ( chars.charAt( 0 ) == '-' ) ? true : false;
+ public static long parseLong(CharSequence chars, int radix) {
+ try {
+ boolean isNegative = (chars.charAt(0) == '-') ? true : false;
long result = 0;
- long limit = ( isNegative ) ? Long.MIN_VALUE : -Long.MAX_VALUE;
+ long limit = (isNegative) ? Long.MIN_VALUE : -Long.MAX_VALUE;
long multmin = limit / radix;
int length = chars.length();
- int i = ( isNegative || ( chars.charAt( 0 ) == '+' ) ) ? 1 : 0;
- while ( true )
- {
- int digit = Character.digit( chars.charAt( i ), radix );
+ int i = (isNegative || (chars.charAt(0) == '+')) ? 1 : 0;
+ while (true) {
+ int digit = Character.digit(chars.charAt(i), radix);
long tmp = result * radix;
- if ( ( digit < 0 ) || ( result < multmin ) || ( tmp < limit + digit ) )
- { // Overflow.
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ if ((digit < 0) || (result < multmin) || (tmp < limit + digit)) { // Overflow.
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
// Accumulates negatively to avoid surprises near MAX_VALUE
result = tmp - digit;
- if ( ++i >= length )
- {
+ if (++i >= length) {
break;
}
}
return isNegative ? result : -result;
- }
- catch ( IndexOutOfBoundsException e )
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ } catch (IndexOutOfBoundsException e) {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
}
@@ -282,16 +248,12 @@ public static long parseLong( CharSequence chars, int radix )
* @return the float number represented by the specified character sequence.
* @throws NumberFormatException if the character sequence does not contain a parsable float.
*/
- public static float parseFloat( CharSequence chars )
- {
- double d = parseDouble( chars );
- if ( ( d >= Float.MIN_VALUE ) && ( d <= Float.MAX_VALUE ) )
- {
+ public static float parseFloat(CharSequence chars) {
+ double d = parseDouble(chars);
+ if ((d >= Float.MIN_VALUE) && (d <= Float.MAX_VALUE)) {
return (float) d;
- }
- else
- {
- throw new NumberFormatException( "Float overflow for input characters: \"" + chars.toString() + "\"" );
+ } else {
+ throw new NumberFormatException("Float overflow for input characters: \"" + chars.toString() + "\"");
}
}
@@ -302,87 +264,63 @@ public static float parseFloat( CharSequence chars )
* @return the double number represented by this character sequence.
* @throws NumberFormatException if the character sequence does not contain a parsable double.
*/
- public static double parseDouble( CharSequence chars )
- throws NumberFormatException
- {
- try
- {
+ public static double parseDouble(CharSequence chars) throws NumberFormatException {
+ try {
int length = chars.length();
double result = 0.0;
int exp = 0;
- boolean isNegative = ( chars.charAt( 0 ) == '-' ) ? true : false;
- int i = ( isNegative || ( chars.charAt( 0 ) == '+' ) ) ? 1 : 0;
+ boolean isNegative = (chars.charAt(0) == '-') ? true : false;
+ int i = (isNegative || (chars.charAt(0) == '+')) ? 1 : 0;
// Checks special cases NaN or Infinity.
- if ( ( chars.charAt( i ) == 'N' ) || ( chars.charAt( i ) == 'I' ) )
- {
- if ( chars.toString().equals( "NaN" ) )
- {
+ if ((chars.charAt(i) == 'N') || (chars.charAt(i) == 'I')) {
+ if (chars.toString().equals("NaN")) {
return Double.NaN;
- }
- else if ( chars.subSequence( i, length ).toString().equals( "Infinity" ) )
- {
+ } else if (chars.subSequence(i, length).toString().equals("Infinity")) {
return isNegative ? Double.NEGATIVE_INFINITY : Double.POSITIVE_INFINITY;
}
}
// Reads decimal number.
boolean fraction = false;
- while ( true )
- {
- char c = chars.charAt( i );
- if ( ( c == '.' ) && ( !fraction ) )
- {
+ while (true) {
+ char c = chars.charAt(i);
+ if ((c == '.') && (!fraction)) {
fraction = true;
- }
- else if ( ( c == 'e' ) || ( c == 'E' ) )
- {
+ } else if ((c == 'e') || (c == 'E')) {
break;
- }
- else if ( ( c >= '0' ) && ( c <= '9' ) )
- {
- result = result * 10 + ( c - '0' );
- if ( fraction )
- {
+ } else if ((c >= '0') && (c <= '9')) {
+ result = result * 10 + (c - '0');
+ if (fraction) {
exp--;
}
+ } else {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
- else
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
- }
- if ( ++i >= length )
- {
+ if (++i >= length) {
break;
}
}
result = isNegative ? -result : result;
// Reads exponent (if any).
- if ( i < length )
- {
+ if (i < length) {
i++;
- boolean negE = ( chars.charAt( i ) == '-' ) ? true : false;
- i = ( negE || ( chars.charAt( i ) == '+' ) ) ? i + 1 : i;
+ boolean negE = (chars.charAt(i) == '-') ? true : false;
+ i = (negE || (chars.charAt(i) == '+')) ? i + 1 : i;
int valE = 0;
- while ( true )
- {
- char c = chars.charAt( i );
- if ( ( c >= '0' ) && ( c <= '9' ) )
- {
- valE = valE * 10 + ( c - '0' );
- if ( valE > 10000000 )
- { // Hard-limit to avoid overflow.
+ while (true) {
+ char c = chars.charAt(i);
+ if ((c >= '0') && (c <= '9')) {
+ valE = valE * 10 + (c - '0');
+ if (valE > 10000000) { // Hard-limit to avoid overflow.
valE = 10000000;
}
+ } else {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
- else
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
- }
- if ( ++i >= length )
- {
+ if (++i >= length) {
break;
}
}
@@ -390,12 +328,10 @@ else if ( ( c >= '0' ) && ( c <= '9' ) )
}
// Returns product decimal number with exponent.
- return multE( result, exp );
+ return multE(result, exp);
- }
- catch ( IndexOutOfBoundsException e )
- {
- throw new NumberFormatException( "For input characters: \"" + chars.toString() + "\"" );
+ } catch (IndexOutOfBoundsException e) {
+ throw new NumberFormatException("For input characters: \"" + chars.toString() + "\"");
}
}
@@ -408,9 +344,8 @@ else if ( ( c >= '0' ) && ( c <= '9' ) )
* @return the specified StringBuffer object.
* @see #parseBoolean
*/
- public static StringBuffer format( boolean b, StringBuffer sb )
- {
- return b ? sb.append( "true" ) : sb.append( "false" );
+ public static StringBuffer format(boolean b, StringBuffer sb) {
+ return b ? sb.append("true") : sb.append("false");
}
/**
@@ -427,9 +362,8 @@ public static StringBuffer format( boolean b, StringBuffer sb )
* @return the specified StringBuffer object.
* @see #parseShort
*/
- public static StringBuffer format( short s, StringBuffer sb )
- {
- return format( (int) s, sb ); // Forwards to int formatting (fast).
+ public static StringBuffer format(short s, StringBuffer sb) {
+ return format((int) s, sb); // Forwards to int formatting (fast).
}
/**
@@ -442,9 +376,8 @@ public static StringBuffer format( short s, StringBuffer sb )
* @return the specified StringBuffer object.
* @see #parseShort(CharSequence, int) throws IllegalArgumentException if radix is not in [2 .. 36] range.
*/
- public static StringBuffer format( short s, int radix, StringBuffer sb )
- {
- return format( (int) s, radix, sb ); // Forwards to int formatting (fast).
+ public static StringBuffer format(short s, int radix, StringBuffer sb) {
+ return format((int) s, radix, sb); // Forwards to int formatting (fast).
}
/**
@@ -461,42 +394,33 @@ public static StringBuffer format( short s, int radix, StringBuffer sb )
* @return the specified StringBuffer object.
* @see #parseInt
*/
- public static StringBuffer format( int i, StringBuffer sb )
- {
- if ( i <= 0 )
- {
- if ( i == Integer.MIN_VALUE )
- { // Negation would overflow.
- return sb.append( "-2147483648" ); // 11 char max.
- }
- else if ( i == 0 )
- {
- return sb.append( '0' );
+ public static StringBuffer format(int i, StringBuffer sb) {
+ if (i <= 0) {
+ if (i == Integer.MIN_VALUE) { // Negation would overflow.
+ return sb.append("-2147483648"); // 11 char max.
+ } else if (i == 0) {
+ return sb.append('0');
}
i = -i;
- sb.append( '-' );
+ sb.append('-');
}
int j = 1;
- for ( ; ( j < 10 ) && ( i >= INT_POW_10[j] ); j++ )
- {
- }
+ for (; (j < 10) && (i >= INT_POW_10[j]); j++) {}
// POW_10[j] > i >= POW_10[j-1]
- for ( j--; j >= 0; j-- )
- {
+ for (j--; j >= 0; j--) {
int pow10 = INT_POW_10[j];
int digit = i / pow10;
i -= digit * pow10;
- sb.append( DIGITS[digit] );
+ sb.append(DIGITS[digit]);
}
return sb;
}
private static final int[] INT_POW_10 = new int[10];
- static
- {
+
+ static {
int pow = 1;
- for ( int i = 0; i < 10; i++ )
- {
+ for (int i = 0; i < 10; i++) {
INT_POW_10[i] = pow;
pow *= 10;
}
@@ -512,38 +436,27 @@ else if ( i == 0 )
* @return the specified StringBuffer object.
* @see #parseInt(CharSequence, int) throws IllegalArgumentException if radix is not in [2 .. 36] range.
*/
- public static StringBuffer format( int i, int radix, StringBuffer sb )
- {
- if ( radix == 10 )
- {
- return format( i, sb ); // Faster version.
- }
- else if ( radix < 2 || radix > 36 )
- {
- throw new IllegalArgumentException( "radix: " + radix );
- }
- if ( i < 0 )
- {
- sb.append( '-' );
- }
- else
- {
+ public static StringBuffer format(int i, int radix, StringBuffer sb) {
+ if (radix == 10) {
+ return format(i, sb); // Faster version.
+ } else if (radix < 2 || radix > 36) {
+ throw new IllegalArgumentException("radix: " + radix);
+ }
+ if (i < 0) {
+ sb.append('-');
+ } else {
i = -i;
}
- format2( i, radix, sb );
+ format2(i, radix, sb);
return sb;
}
- private static void format2( int i, int radix, StringBuffer sb )
- {
- if ( i <= -radix )
- {
- format2( i / radix, radix, sb );
- sb.append( DIGITS[-( i % radix )] );
- }
- else
- {
- sb.append( DIGITS[-i] );
+ private static void format2(int i, int radix, StringBuffer sb) {
+ if (i <= -radix) {
+ format2(i / radix, radix, sb);
+ sb.append(DIGITS[-(i % radix)]);
+ } else {
+ sb.append(DIGITS[-i]);
}
}
@@ -561,42 +474,33 @@ private static void format2( int i, int radix, StringBuffer sb )
* @return the specified StringBuffer object.
* @see #parseLong
*/
- public static StringBuffer format( long l, StringBuffer sb )
- {
- if ( l <= 0 )
- {
- if ( l == Long.MIN_VALUE )
- { // Negation would overflow.
- return sb.append( "-9223372036854775808" ); // 20 characters max.
- }
- else if ( l == 0 )
- {
- return sb.append( '0' );
+ public static StringBuffer format(long l, StringBuffer sb) {
+ if (l <= 0) {
+ if (l == Long.MIN_VALUE) { // Negation would overflow.
+ return sb.append("-9223372036854775808"); // 20 characters max.
+ } else if (l == 0) {
+ return sb.append('0');
}
l = -l;
- sb.append( '-' );
+ sb.append('-');
}
int j = 1;
- for ( ; ( j < 19 ) && ( l >= LONG_POW_10[j] ); j++ )
- {
- }
+ for (; (j < 19) && (l >= LONG_POW_10[j]); j++) {}
// POW_10[j] > l >= POW_10[j-1]
- for ( j--; j >= 0; j-- )
- {
+ for (j--; j >= 0; j--) {
long pow10 = LONG_POW_10[j];
- int digit = (int) ( l / pow10 );
+ int digit = (int) (l / pow10);
l -= digit * pow10;
- sb.append( DIGITS[digit] );
+ sb.append(DIGITS[digit]);
}
return sb;
}
private static final long[] LONG_POW_10 = new long[19];
- static
- {
+
+ static {
long pow = 1;
- for ( int i = 0; i < 19; i++ )
- {
+ for (int i = 0; i < 19; i++) {
LONG_POW_10[i] = pow;
pow *= 10;
}
@@ -612,38 +516,27 @@ else if ( l == 0 )
* @return the specified StringBuffer object.
* @see #parseLong(CharSequence, int) throws IllegalArgumentException if radix is not in [2 .. 36] range.
*/
- public static StringBuffer format( long l, int radix, StringBuffer sb )
- {
- if ( radix == 10 )
- {
- return format( l, sb ); // Faster version.
- }
- else if ( radix < 2 || radix > 36 )
- {
- throw new IllegalArgumentException( "radix: " + radix );
- }
- if ( l < 0 )
- {
- sb.append( '-' );
- }
- else
- {
+ public static StringBuffer format(long l, int radix, StringBuffer sb) {
+ if (radix == 10) {
+ return format(l, sb); // Faster version.
+ } else if (radix < 2 || radix > 36) {
+ throw new IllegalArgumentException("radix: " + radix);
+ }
+ if (l < 0) {
+ sb.append('-');
+ } else {
l = -l;
}
- format2( l, radix, sb );
+ format2(l, radix, sb);
return sb;
}
- private static void format2( long l, int radix, StringBuffer sb )
- {
- if ( l <= -radix )
- {
- format2( l / radix, radix, sb );
- sb.append( DIGITS[(int) -( l % radix )] );
- }
- else
- {
- sb.append( DIGITS[(int) -l] );
+ private static void format2(long l, int radix, StringBuffer sb) {
+ if (l <= -radix) {
+ format2(l / radix, radix, sb);
+ sb.append(DIGITS[(int) -(l % radix)]);
+ } else {
+ sb.append(DIGITS[(int) -l]);
}
}
@@ -656,9 +549,8 @@ private static void format2( long l, int radix, StringBuffer sb )
* @return format(f, 0.0f, sb)
* @see #format(float, float, StringBuffer)
*/
- public static StringBuffer format( float f, StringBuffer sb )
- {
- return format( f, 0.0f, sb );
+ public static StringBuffer format(float f, StringBuffer sb) {
+ return format(f, 0.0f, sb);
}
/**
@@ -680,31 +572,22 @@ public static StringBuffer format( float f, StringBuffer sb )
* @return the specified StringBuffer object.
* @throws IllegalArgumentException if the specified precision is negative or would result in too many digits (19+).
*/
- public static StringBuffer format( float f, float precision, StringBuffer sb )
- {
+ public static StringBuffer format(float f, float precision, StringBuffer sb) {
// Adjusts precision.
boolean precisionOnLastDigit;
- if ( precision > 0.0f )
- {
+ if (precision > 0.0f) {
precisionOnLastDigit = true;
- }
- else if ( precision == 0.0f )
- {
- if ( f != 0.0f )
- {
+ } else if (precision == 0.0f) {
+ if (f != 0.0f) {
precisionOnLastDigit = false;
- precision = Math.max( Math.abs( f * FLOAT_RELATIVE_ERROR ), Float.MIN_VALUE );
+ precision = Math.max(Math.abs(f * FLOAT_RELATIVE_ERROR), Float.MIN_VALUE);
+ } else {
+ return sb.append("0.0"); // Exact zero.
}
- else
- {
- return sb.append( "0.0" ); // Exact zero.
- }
- }
- else
- {
- throw new IllegalArgumentException( "precision: Negative values not allowed" );
+ } else {
+ throw new IllegalArgumentException("precision: Negative values not allowed");
}
- return format( f, precision, precisionOnLastDigit, sb );
+ return format(f, precision, precisionOnLastDigit, sb);
}
/**
@@ -723,9 +606,8 @@ else if ( precision == 0.0f )
* @return format(d, 0.0, sb)
* @see #format(double, double, StringBuffer)
*/
- public static StringBuffer format( double d, StringBuffer sb )
- {
- return format( d, 0.0, sb );
+ public static StringBuffer format(double d, StringBuffer sb) {
+ return format(d, 0.0, sb);
}
/**
@@ -738,16 +620,12 @@ public static StringBuffer format( double d, StringBuffer sb )
* @return the specified StringBuffer object.
* @throws IllegalArgumentException if the number of digits is not in range [1..19].
*/
- public static StringBuffer format( double d, int digits, StringBuffer sb )
- {
- if ( ( digits >= 1 ) && ( digits <= 19 ) )
- {
- double precision = Math.abs( d / DOUBLE_POW_10[digits - 1] );
- return format( d, precision, sb );
- }
- else
- {
- throw new java.lang.IllegalArgumentException( "digits: " + digits + " is not in range [1 .. 19]" );
+ public static StringBuffer format(double d, int digits, StringBuffer sb) {
+ if ((digits >= 1) && (digits <= 19)) {
+ double precision = Math.abs(d / DOUBLE_POW_10[digits - 1]);
+ return format(d, precision, sb);
+ } else {
+ throw new java.lang.IllegalArgumentException("digits: " + digits + " is not in range [1 .. 19]");
}
}
@@ -770,30 +648,21 @@ public static StringBuffer format( double d, int digits, StringBuffer sb )
* @return the specified StringBuffer object.
* @throws IllegalArgumentException if the specified precision is negative or would result in too many digits (19+).
*/
- public static StringBuffer format( double d, double precision, StringBuffer sb )
- {
+ public static StringBuffer format(double d, double precision, StringBuffer sb) {
// Adjusts precision.
boolean precisionOnLastDigit = false;
- if ( precision > 0.0 )
- {
+ if (precision > 0.0) {
precisionOnLastDigit = true;
- }
- else if ( precision == 0.0 )
- {
- if ( d != 0.0 )
- {
- precision = Math.max( Math.abs( d * DOUBLE_RELATIVE_ERROR ), Double.MIN_VALUE );
- }
- else
- {
- return sb.append( "0.0" ); // Exact zero.
+ } else if (precision == 0.0) {
+ if (d != 0.0) {
+ precision = Math.max(Math.abs(d * DOUBLE_RELATIVE_ERROR), Double.MIN_VALUE);
+ } else {
+ return sb.append("0.0"); // Exact zero.
}
+ } else if (precision < 0.0) { // Not NaN
+ throw new IllegalArgumentException("precision: Negative values not allowed");
}
- else if ( precision < 0.0 )
- { // Not NaN
- throw new IllegalArgumentException( "precision: Negative values not allowed" );
- }
- return format( d, precision, precisionOnLastDigit, sb );
+ return format(d, precision, precisionOnLastDigit, sb);
}
/**
@@ -806,96 +675,77 @@ else if ( precision < 0.0 )
* @param sb the StringBuffer to append.
* @return the specified StringBuffer object.
*/
- private static StringBuffer format( double d, double precision, boolean precisionOnLastDigit, StringBuffer sb )
- {
+ private static StringBuffer format(double d, double precision, boolean precisionOnLastDigit, StringBuffer sb) {
// Special cases.
- if ( Double.isNaN( d ) )
- {
- return sb.append( "NaN" );
- }
- else if ( Double.isInfinite( d ) )
- {
- return ( d >= 0 ) ? sb.append( "Infinity" ) : sb.append( "-Infinity" );
+ if (Double.isNaN(d)) {
+ return sb.append("NaN");
+ } else if (Double.isInfinite(d)) {
+ return (d >= 0) ? sb.append("Infinity") : sb.append("-Infinity");
}
- if ( d < 0 )
- {
+ if (d < 0) {
d = -d;
- sb.append( '-' );
+ sb.append('-');
}
// Formats decimal part.
- int rank = (int) Math.floor( Math.log( precision ) / LOG_10 );
- double digitValue = multE( d, -rank );
- if ( digitValue >= Long.MAX_VALUE )
- {
- throw new IllegalArgumentException( "Specified precision would result in too many digits" );
+ int rank = (int) Math.floor(Math.log(precision) / LOG_10);
+ double digitValue = multE(d, -rank);
+ if (digitValue >= Long.MAX_VALUE) {
+ throw new IllegalArgumentException("Specified precision would result in too many digits");
}
int digitStart = sb.length();
- format( Math.round( digitValue ), sb );
+ format(Math.round(digitValue), sb);
int digitLength = sb.length() - digitStart;
int dotPos = digitLength + rank;
boolean useScientificNotation = false;
// Inserts dot ('.')
- if ( ( dotPos <= -LEADING_ZEROS.length ) || ( dotPos > digitLength ) )
- {
+ if ((dotPos <= -LEADING_ZEROS.length) || (dotPos > digitLength)) {
// Scientific notation has to be used ("x.xxxEyy").
- sb.insert( digitStart + 1, '.' );
+ sb.insert(digitStart + 1, '.');
useScientificNotation = true;
- }
- else if ( dotPos > 0 )
- {
+ } else if (dotPos > 0) {
// Dot within the string ("xxxx.xxxxx").
- sb.insert( digitStart + dotPos, '.' );
- }
- else
- {
+ sb.insert(digitStart + dotPos, '.');
+ } else {
// Leading zeros ("0.xxxxx").
- sb.insert( digitStart, LEADING_ZEROS[-dotPos] );
+ sb.insert(digitStart, LEADING_ZEROS[-dotPos]);
}
// Removes trailing zeros.
- if ( !precisionOnLastDigit )
- {
+ if (!precisionOnLastDigit) {
int newLength = sb.length();
- do
- {
+ do {
newLength--;
- }
- while ( sb.charAt( newLength ) == '0' );
- sb.setLength( newLength + 1 );
+ } while (sb.charAt(newLength) == '0');
+ sb.setLength(newLength + 1);
}
// Avoids trailing '.'
- if ( sb.charAt( sb.length() - 1 ) == '.' )
- {
- if ( precisionOnLastDigit )
- {
- sb.setLength( sb.length() - 1 ); // Prefers "xxx" to "xxx."
- }
- else
- {
- sb.append( '0' ); // Prefer "xxx.0" to "xxx."
+ if (sb.charAt(sb.length() - 1) == '.') {
+ if (precisionOnLastDigit) {
+ sb.setLength(sb.length() - 1); // Prefers "xxx" to "xxx."
+ } else {
+ sb.append('0'); // Prefer "xxx.0" to "xxx."
}
}
// Writes exponent.
- if ( useScientificNotation )
- {
- sb.append( 'E' );
- format( dotPos - 1, sb );
+ if (useScientificNotation) {
+ sb.append('E');
+ format(dotPos - 1, sb);
}
return sb;
}
- private static final double LOG_10 = Math.log( 10 );
+ private static final double LOG_10 = Math.log(10);
- private static final float FLOAT_RELATIVE_ERROR = (float) Math.pow( 2, -24 );
+ private static final float FLOAT_RELATIVE_ERROR = (float) Math.pow(2, -24);
- private static final double DOUBLE_RELATIVE_ERROR = Math.pow( 2, -53 );
+ private static final double DOUBLE_RELATIVE_ERROR = Math.pow(2, -53);
- private static String[] LEADING_ZEROS = { "0.", "0.0", "0.00" };
+ private static String[] LEADING_ZEROS = {"0.", "0.0", "0.00"};
/**
* Returns the product of the specified value with 10 raised at the specified power exponent.
@@ -904,33 +754,23 @@ else if ( dotPos > 0 )
* @param E the exponent.
* @return value * 10^E
*/
- private static final double multE( double value, int E )
- {
- if ( E >= 0 )
- {
- if ( E <= 308 )
- {
+ private static final double multE(double value, int E) {
+ if (E >= 0) {
+ if (E <= 308) {
// Max: 1.7976931348623157E+308
return value * DOUBLE_POW_10[E];
- }
- else
- {
+ } else {
value *= 1E21; // Exact multiplicand.
- E = Math.min( 308, E - 21 );
+ E = Math.min(308, E - 21);
return value * DOUBLE_POW_10[E];
}
- }
- else
- {
- if ( E >= -308 )
- {
+ } else {
+ if (E >= -308) {
return value / DOUBLE_POW_10[-E];
- }
- else
- {
+ } else {
// Min: 4.9E-324
value /= 1E21; // Exact divisor.
- E = Math.max( -308, E + 21 );
+ E = Math.max(-308, E + 21);
return value / DOUBLE_POW_10[-E];
}
}
@@ -939,30 +779,25 @@ private static final double multE( double value, int E )
// Note: Approximation for exponents > 21. This may introduce round-off
// errors (e.g. 1E23 represented as "9.999999999999999E22").
private static final double[] DOUBLE_POW_10 = new double[] {
-
1E000, 1E001, 1E002, 1E003, 1E004, 1E005, 1E006, 1E007, 1E008, 1E009, 1E010, 1E011, 1E012, 1E013, 1E014, 1E015,
1E016, 1E017, 1E018, 1E019, 1E020, 1E021, 1E022, 1E023, 1E024, 1E025, 1E026, 1E027, 1E028, 1E029, 1E030, 1E031,
1E032, 1E033, 1E034, 1E035, 1E036, 1E037, 1E038, 1E039, 1E040, 1E041, 1E042, 1E043, 1E044, 1E045, 1E046, 1E047,
1E048, 1E049, 1E050, 1E051, 1E052, 1E053, 1E054, 1E055, 1E056, 1E057, 1E058, 1E059, 1E060, 1E061, 1E062, 1E063,
1E064, 1E065, 1E066, 1E067, 1E068, 1E069, 1E070, 1E071, 1E072, 1E073, 1E074, 1E075, 1E076, 1E077, 1E078, 1E079,
1E080, 1E081, 1E082, 1E083, 1E084, 1E085, 1E086, 1E087, 1E088, 1E089, 1E090, 1E091, 1E092, 1E093, 1E094, 1E095,
- 1E096, 1E097, 1E098, 1E099,
-
- 1E100, 1E101, 1E102, 1E103, 1E104, 1E105, 1E106, 1E107, 1E108, 1E109, 1E110, 1E111, 1E112, 1E113, 1E114, 1E115,
- 1E116, 1E117, 1E118, 1E119, 1E120, 1E121, 1E122, 1E123, 1E124, 1E125, 1E126, 1E127, 1E128, 1E129, 1E130, 1E131,
- 1E132, 1E133, 1E134, 1E135, 1E136, 1E137, 1E138, 1E139, 1E140, 1E141, 1E142, 1E143, 1E144, 1E145, 1E146, 1E147,
- 1E148, 1E149, 1E150, 1E151, 1E152, 1E153, 1E154, 1E155, 1E156, 1E157, 1E158, 1E159, 1E160, 1E161, 1E162, 1E163,
- 1E164, 1E165, 1E166, 1E167, 1E168, 1E169, 1E170, 1E171, 1E172, 1E173, 1E174, 1E175, 1E176, 1E177, 1E178, 1E179,
- 1E180, 1E181, 1E182, 1E183, 1E184, 1E185, 1E186, 1E187, 1E188, 1E189, 1E190, 1E191, 1E192, 1E193, 1E194, 1E195,
- 1E196, 1E197, 1E198, 1E199,
-
- 1E200, 1E201, 1E202, 1E203, 1E204, 1E205, 1E206, 1E207, 1E208, 1E209, 1E210, 1E211, 1E212, 1E213, 1E214, 1E215,
- 1E216, 1E217, 1E218, 1E219, 1E220, 1E221, 1E222, 1E223, 1E224, 1E225, 1E226, 1E227, 1E228, 1E229, 1E230, 1E231,
- 1E232, 1E233, 1E234, 1E235, 1E236, 1E237, 1E238, 1E239, 1E240, 1E241, 1E242, 1E243, 1E244, 1E245, 1E246, 1E247,
- 1E248, 1E249, 1E250, 1E251, 1E252, 1E253, 1E254, 1E255, 1E256, 1E257, 1E258, 1E259, 1E260, 1E261, 1E262, 1E263,
- 1E264, 1E265, 1E266, 1E267, 1E268, 1E269, 1E270, 1E271, 1E272, 1E273, 1E274, 1E275, 1E276, 1E277, 1E278, 1E279,
- 1E280, 1E281, 1E282, 1E283, 1E284, 1E285, 1E286, 1E287, 1E288, 1E289, 1E290, 1E291, 1E292, 1E293, 1E294, 1E295,
- 1E296, 1E297, 1E298, 1E299,
-
- 1E300, 1E301, 1E302, 1E303, 1E304, 1E305, 1E306, 1E307, 1E308 };
-}
\ No newline at end of file
+ 1E096, 1E097, 1E098, 1E099, 1E100, 1E101, 1E102, 1E103, 1E104, 1E105, 1E106, 1E107, 1E108, 1E109, 1E110, 1E111,
+ 1E112, 1E113, 1E114, 1E115, 1E116, 1E117, 1E118, 1E119, 1E120, 1E121, 1E122, 1E123, 1E124, 1E125, 1E126, 1E127,
+ 1E128, 1E129, 1E130, 1E131, 1E132, 1E133, 1E134, 1E135, 1E136, 1E137, 1E138, 1E139, 1E140, 1E141, 1E142, 1E143,
+ 1E144, 1E145, 1E146, 1E147, 1E148, 1E149, 1E150, 1E151, 1E152, 1E153, 1E154, 1E155, 1E156, 1E157, 1E158, 1E159,
+ 1E160, 1E161, 1E162, 1E163, 1E164, 1E165, 1E166, 1E167, 1E168, 1E169, 1E170, 1E171, 1E172, 1E173, 1E174, 1E175,
+ 1E176, 1E177, 1E178, 1E179, 1E180, 1E181, 1E182, 1E183, 1E184, 1E185, 1E186, 1E187, 1E188, 1E189, 1E190, 1E191,
+ 1E192, 1E193, 1E194, 1E195, 1E196, 1E197, 1E198, 1E199, 1E200, 1E201, 1E202, 1E203, 1E204, 1E205, 1E206, 1E207,
+ 1E208, 1E209, 1E210, 1E211, 1E212, 1E213, 1E214, 1E215, 1E216, 1E217, 1E218, 1E219, 1E220, 1E221, 1E222, 1E223,
+ 1E224, 1E225, 1E226, 1E227, 1E228, 1E229, 1E230, 1E231, 1E232, 1E233, 1E234, 1E235, 1E236, 1E237, 1E238, 1E239,
+ 1E240, 1E241, 1E242, 1E243, 1E244, 1E245, 1E246, 1E247, 1E248, 1E249, 1E250, 1E251, 1E252, 1E253, 1E254, 1E255,
+ 1E256, 1E257, 1E258, 1E259, 1E260, 1E261, 1E262, 1E263, 1E264, 1E265, 1E266, 1E267, 1E268, 1E269, 1E270, 1E271,
+ 1E272, 1E273, 1E274, 1E275, 1E276, 1E277, 1E278, 1E279, 1E280, 1E281, 1E282, 1E283, 1E284, 1E285, 1E286, 1E287,
+ 1E288, 1E289, 1E290, 1E291, 1E292, 1E293, 1E294, 1E295, 1E296, 1E297, 1E298, 1E299, 1E300, 1E301, 1E302, 1E303,
+ 1E304, 1E305, 1E306, 1E307, 1E308
+ };
+}
diff --git a/src/main/java/org/codehaus/plexus/util/WriterFactory.java b/src/main/java/org/codehaus/plexus/util/WriterFactory.java
index cf8326c4..09d8ca64 100644
--- a/src/main/java/org/codehaus/plexus/util/WriterFactory.java
+++ b/src/main/java/org/codehaus/plexus/util/WriterFactory.java
@@ -30,18 +30,21 @@
/**
* Utility to create Writers, with explicit encoding choice: platform default, XML, or specified.
*
+ * @deprecated This class has been deprecated. When writing XML, users can create the {@link XmlStreamWriter} instance
+ * directly. For other usages, using {@link Files} helper methods is recommended.
+ *
* @author Herve Boutemy
* @see Charset
* @see Supported encodings
*
* @since 1.4.4
*/
-public class WriterFactory
-{
+@Deprecated
+public class WriterFactory {
/**
* ISO Latin Alphabet #1, also known as ISO-LATIN-1. Every implementation of the Java platform is required to
* support this character encoding.
- *
+ *
* @see Charset
*/
public static final String ISO_8859_1 = "ISO-8859-1";
@@ -49,7 +52,7 @@ public class WriterFactory
/**
* Seven-bit ASCII, also known as ISO646-US, also known as the Basic Latin block of the Unicode character set. Every
* implementation of the Java platform is required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String US_ASCII = "US-ASCII";
@@ -58,7 +61,7 @@ public class WriterFactory
* Sixteen-bit Unicode Transformation Format, byte order specified by a mandatory initial byte-order mark (either
* order accepted on input, big-endian used on output). Every implementation of the Java platform is required to
* support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16 = "UTF-16";
@@ -66,7 +69,7 @@ public class WriterFactory
/**
* Sixteen-bit Unicode Transformation Format, big-endian byte order. Every implementation of the Java platform is
* required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16BE = "UTF-16BE";
@@ -74,7 +77,7 @@ public class WriterFactory
/**
* Sixteen-bit Unicode Transformation Format, little-endian byte order. Every implementation of the Java platform is
* required to support this character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_16LE = "UTF-16LE";
@@ -82,7 +85,7 @@ public class WriterFactory
/**
* Eight-bit Unicode Transformation Format. Every implementation of the Java platform is required to support this
* character encoding.
- *
+ *
* @see Charset
*/
public static final String UTF_8 = "UTF-8";
@@ -90,7 +93,7 @@ public class WriterFactory
/**
* The file.encoding System Property.
*/
- public static final String FILE_ENCODING = System.getProperty( "file.encoding" );
+ public static final String FILE_ENCODING = System.getProperty("file.encoding");
/**
* Create a new Writer with XML encoding detection rules.
@@ -100,10 +103,8 @@ public class WriterFactory
* @throws IOException if any.
* @see XmlStreamWriter
*/
- public static XmlStreamWriter newXmlWriter( OutputStream out )
- throws IOException
- {
- return new XmlStreamWriter( out );
+ public static XmlStreamWriter newXmlWriter(OutputStream out) throws IOException {
+ return new XmlStreamWriter(out);
}
/**
@@ -114,10 +115,8 @@ public static XmlStreamWriter newXmlWriter( OutputStream out )
* @throws IOException if any.
* @see XmlStreamWriter
*/
- public static XmlStreamWriter newXmlWriter( File file )
- throws IOException
- {
- return new XmlStreamWriter( file );
+ public static XmlStreamWriter newXmlWriter(File file) throws IOException {
+ return new XmlStreamWriter(file);
}
/**
@@ -127,9 +126,8 @@ public static XmlStreamWriter newXmlWriter( File file )
* @return a writer instance for the output stream using the default platform charset.
* @see Charset#defaultCharset()
*/
- public static Writer newPlatformWriter( OutputStream out )
- {
- return new OutputStreamWriter( out );
+ public static Writer newPlatformWriter(OutputStream out) {
+ return new OutputStreamWriter(out);
}
/**
@@ -140,10 +138,8 @@ public static Writer newPlatformWriter( OutputStream out )
* @throws IOException if any.
* @see Charset#defaultCharset()
*/
- public static Writer newPlatformWriter( File file )
- throws IOException
- {
- return Files.newBufferedWriter( file.toPath() );
+ public static Writer newPlatformWriter(File file) throws IOException {
+ return Files.newBufferedWriter(file.toPath());
}
/**
@@ -155,10 +151,8 @@ public static Writer newPlatformWriter( File file )
* @throws UnsupportedEncodingException if any.
* @see Supported encodings
*/
- public static Writer newWriter( OutputStream out, String encoding )
- throws UnsupportedEncodingException
- {
- return new OutputStreamWriter( out, encoding );
+ public static Writer newWriter(OutputStream out, String encoding) throws UnsupportedEncodingException {
+ return new OutputStreamWriter(out, encoding);
}
/**
@@ -170,9 +164,7 @@ public static Writer newWriter( OutputStream out, String encoding )
* @throws IOException if any.
* @see Supported encodings
*/
- public static Writer newWriter( File file, String encoding )
- throws IOException
- {
- return newWriter( Files.newOutputStream( file.toPath() ), encoding );
+ public static Writer newWriter(File file, String encoding) throws IOException {
+ return newWriter(Files.newOutputStream(file.toPath()), encoding);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java b/src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java
index 2ad16366..64b9deba 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/AbstractStreamHandler.java
@@ -19,40 +19,30 @@
/**
* @author Kristian Rosenvold
*/
-public class AbstractStreamHandler
- extends Thread
-{
+public class AbstractStreamHandler extends Thread {
private boolean done;
private volatile boolean disabled;
- public boolean isDone()
- {
+ public boolean isDone() {
return done;
}
- public synchronized void waitUntilDone()
- throws InterruptedException
- {
- while ( !isDone() )
- {
+ public synchronized void waitUntilDone() throws InterruptedException {
+ while (!isDone()) {
wait();
}
}
- protected boolean isDisabled()
- {
+ protected boolean isDisabled() {
return disabled;
}
- public void disable()
- {
+ public void disable() {
disabled = true;
}
- public void setDone()
- {
+ public void setDone() {
done = true;
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/Arg.java b/src/main/java/org/codehaus/plexus/util/cli/Arg.java
index 75886ef9..4650288c 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/Arg.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/Arg.java
@@ -18,13 +18,12 @@
import java.io.File;
-public interface Arg
-{
- void setValue( String value );
+public interface Arg {
+ void setValue(String value);
- void setLine( String line );
+ void setLine(String line);
- void setFile( File value );
+ void setFile(File value);
String[] getParts();
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java
index 0a861a75..f80a8bc1 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineCallable.java
@@ -20,13 +20,10 @@
/**
* Callable wrapper that exposes the proper exception type to the client.
- *
+ *
* @author Kristian Rosenvold
*/
-public interface CommandLineCallable
- extends Callable
-{
+public interface CommandLineCallable extends Callable {
@Override
- Integer call()
- throws CommandLineException;
+ Integer call() throws CommandLineException;
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
index 9d0a439e..a6bf993c 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineException.java
@@ -20,16 +20,12 @@
* @author Trygve Laugstøl
*
*/
-public class CommandLineException
- extends Exception
-{
- public CommandLineException( String message )
- {
- super( message );
+public class CommandLineException extends Exception {
+ public CommandLineException(String message) {
+ super(message);
}
- public CommandLineException( String message, Throwable cause )
- {
- super( message, cause );
+ public CommandLineException(String message, Throwable cause) {
+ super(message, cause);
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
index 9d90c674..fcfdf3c1 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineTimeOutException.java
@@ -24,18 +24,13 @@
* @since 1.5.9
*
*/
-public class CommandLineTimeOutException
- extends CommandLineException
-{
+public class CommandLineTimeOutException extends CommandLineException {
- public CommandLineTimeOutException( String message )
- {
- super( message );
+ public CommandLineTimeOutException(String message) {
+ super(message);
}
- public CommandLineTimeOutException( String message, Throwable cause )
- {
- super( message, cause );
+ public CommandLineTimeOutException(String message, Throwable cause) {
+ super(message, cause);
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java b/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
index 4a556c84..81b053b9 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/CommandLineUtils.java
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
import java.util.Map;
@@ -31,33 +30,27 @@
* @author Trygve Laugstøl
*
*/
-public abstract class CommandLineUtils
-{
+public abstract class CommandLineUtils {
/**
* A {@code StreamConsumer} providing consumed lines as a {@code String}.
*
* @see #getOutput()
*/
- public static class StringStreamConsumer
- implements StreamConsumer
- {
+ public static class StringStreamConsumer implements StreamConsumer {
private StringBuffer string = new StringBuffer();
- private String ls = System.getProperty( "line.separator" );
+ private String ls = System.getProperty("line.separator");
@Override
- public void consumeLine( String line )
- {
- string.append( line ).append( ls );
+ public void consumeLine(String line) {
+ string.append(line).append(ls);
}
- public String getOutput()
- {
+ public String getOutput() {
return string.toString();
}
-
}
/**
@@ -70,24 +63,21 @@ public String getOutput()
*/
private static final long NANOS_PER_SECOND = 1000000000L;
- public static int executeCommandLine( Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr )
- throws CommandLineException
- {
- return executeCommandLine( cl, null, systemOut, systemErr, 0 );
+ public static int executeCommandLine(Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr)
+ throws CommandLineException {
+ return executeCommandLine(cl, null, systemOut, systemErr, 0);
}
- public static int executeCommandLine( Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr,
- int timeoutInSeconds )
- throws CommandLineException
- {
- return executeCommandLine( cl, null, systemOut, systemErr, timeoutInSeconds );
+ public static int executeCommandLine(
+ Commandline cl, StreamConsumer systemOut, StreamConsumer systemErr, int timeoutInSeconds)
+ throws CommandLineException {
+ return executeCommandLine(cl, null, systemOut, systemErr, timeoutInSeconds);
}
- public static int executeCommandLine( Commandline cl, InputStream systemIn, StreamConsumer systemOut,
- StreamConsumer systemErr )
- throws CommandLineException
- {
- return executeCommandLine( cl, systemIn, systemOut, systemErr, 0 );
+ public static int executeCommandLine(
+ Commandline cl, InputStream systemIn, StreamConsumer systemOut, StreamConsumer systemErr)
+ throws CommandLineException {
+ return executeCommandLine(cl, systemIn, systemOut, systemErr, 0);
}
/**
@@ -99,18 +89,21 @@ public static int executeCommandLine( Commandline cl, InputStream systemIn, Stre
* @return A return value, see {@link Process#exitValue()}
* @throws CommandLineException or CommandLineTimeOutException if time out occurs
*/
- public static int executeCommandLine( Commandline cl, InputStream systemIn, StreamConsumer systemOut,
- StreamConsumer systemErr, int timeoutInSeconds )
- throws CommandLineException
- {
+ public static int executeCommandLine(
+ Commandline cl,
+ InputStream systemIn,
+ StreamConsumer systemOut,
+ StreamConsumer systemErr,
+ int timeoutInSeconds)
+ throws CommandLineException {
final CommandLineCallable future =
- executeCommandLineAsCallable( cl, systemIn, systemOut, systemErr, timeoutInSeconds );
+ executeCommandLineAsCallable(cl, systemIn, systemOut, systemErr, timeoutInSeconds);
return future.call();
}
/**
* Immediately forks a process, returns a callable that will block until process is complete.
- *
+ *
* @param cl The command line to execute
* @param systemIn The input to read from, must be thread safe
* @param systemOut A consumer that receives output, must be thread safe
@@ -121,83 +114,70 @@ public static int executeCommandLine( Commandline cl, InputStream systemIn, Stre
* internal state before after the completion of the call statements
* @throws CommandLineException or CommandLineTimeOutException if time out occurs
*/
- public static CommandLineCallable executeCommandLineAsCallable( final Commandline cl, final InputStream systemIn,
- final StreamConsumer systemOut,
- final StreamConsumer systemErr,
- final int timeoutInSeconds )
- throws CommandLineException
- {
- if ( cl == null )
- {
- throw new IllegalArgumentException( "cl cannot be null." );
+ public static CommandLineCallable executeCommandLineAsCallable(
+ final Commandline cl,
+ final InputStream systemIn,
+ final StreamConsumer systemOut,
+ final StreamConsumer systemErr,
+ final int timeoutInSeconds)
+ throws CommandLineException {
+ if (cl == null) {
+ throw new IllegalArgumentException("cl cannot be null.");
}
final Process p = cl.execute();
- final Thread processHook = new Thread()
- {
+ final Thread processHook = new Thread() {
{
- this.setName( "CommandLineUtils process shutdown hook" );
- this.setContextClassLoader( null );
+ this.setName("CommandLineUtils process shutdown hook");
+ this.setContextClassLoader(null);
}
@Override
- public void run()
- {
+ public void run() {
p.destroy();
}
-
};
- ShutdownHookUtils.addShutDownHook( processHook );
+ ShutdownHookUtils.addShutDownHook(processHook);
- return new CommandLineCallable()
- {
+ return new CommandLineCallable() {
@Override
- public Integer call()
- throws CommandLineException
- {
+ public Integer call() throws CommandLineException {
StreamFeeder inputFeeder = null;
StreamPumper outputPumper = null;
StreamPumper errorPumper = null;
boolean success = false;
- try
- {
- if ( systemIn != null )
- {
- inputFeeder = new StreamFeeder( systemIn, p.getOutputStream() );
+ try {
+ if (systemIn != null) {
+ inputFeeder = new StreamFeeder(systemIn, p.getOutputStream());
inputFeeder.start();
}
- outputPumper = new StreamPumper( p.getInputStream(), systemOut );
+ outputPumper = new StreamPumper(p.getInputStream(), systemOut);
outputPumper.start();
- errorPumper = new StreamPumper( p.getErrorStream(), systemErr );
+ errorPumper = new StreamPumper(p.getErrorStream(), systemErr);
errorPumper.start();
int returnValue;
- if ( timeoutInSeconds <= 0 )
- {
+ if (timeoutInSeconds <= 0) {
returnValue = p.waitFor();
- }
- else
- {
+ } else {
final long now = System.nanoTime();
final long timeout = now + NANOS_PER_SECOND * timeoutInSeconds;
- while ( isAlive( p ) && ( System.nanoTime() < timeout ) )
- {
+ while (isAlive(p) && (System.nanoTime() < timeout)) {
// The timeout is specified in seconds. Therefore we must not sleep longer than one second
// but we should sleep as long as possible to reduce the number of iterations performed.
- Thread.sleep( MILLIS_PER_SECOND - 1L );
+ Thread.sleep(MILLIS_PER_SECOND - 1L);
}
- if ( isAlive( p ) )
- {
- throw new InterruptedException( String.format( "Process timed out after %d seconds.",
- timeoutInSeconds ) );
+ if (isAlive(p)) {
+ throw new InterruptedException(
+ String.format("Process timed out after %d seconds.", timeoutInSeconds));
}
returnValue = p.exitValue();
@@ -224,96 +204,72 @@ public Integer call()
// errorPumper.waitUntilDone();
// }
// }
- if ( inputFeeder != null )
- {
+ if (inputFeeder != null) {
inputFeeder.waitUntilDone();
}
outputPumper.waitUntilDone();
errorPumper.waitUntilDone();
- if ( inputFeeder != null )
- {
+ if (inputFeeder != null) {
inputFeeder.close();
- handleException( inputFeeder, "stdin" );
+ handleException(inputFeeder, "stdin");
}
outputPumper.close();
- handleException( outputPumper, "stdout" );
+ handleException(outputPumper, "stdout");
errorPumper.close();
- handleException( errorPumper, "stderr" );
+ handleException(errorPumper, "stderr");
success = true;
return returnValue;
- }
- catch ( InterruptedException ex )
- {
- throw new CommandLineTimeOutException( "Error while executing external command, process killed.",
- ex );
+ } catch (InterruptedException ex) {
+ throw new CommandLineTimeOutException(
+ "Error while executing external command, process killed.", ex);
- }
- finally
- {
- if ( inputFeeder != null )
- {
+ } finally {
+ if (inputFeeder != null) {
inputFeeder.disable();
}
- if ( outputPumper != null )
- {
+ if (outputPumper != null) {
outputPumper.disable();
}
- if ( errorPumper != null )
- {
+ if (errorPumper != null) {
errorPumper.disable();
}
- try
- {
- ShutdownHookUtils.removeShutdownHook( processHook );
+ try {
+ ShutdownHookUtils.removeShutdownHook(processHook);
processHook.run();
- }
- finally
- {
- try
- {
- if ( inputFeeder != null )
- {
+ } finally {
+ try {
+ if (inputFeeder != null) {
inputFeeder.close();
- if ( success )
- {
+ if (success) {
success = false;
- handleException( inputFeeder, "stdin" );
+ handleException(inputFeeder, "stdin");
success = true; // Only reached when no exception has been thrown.
}
}
- }
- finally
- {
- try
- {
- if ( outputPumper != null )
- {
+ } finally {
+ try {
+ if (outputPumper != null) {
outputPumper.close();
- if ( success )
- {
+ if (success) {
success = false;
- handleException( outputPumper, "stdout" );
+ handleException(outputPumper, "stdout");
success = true; // Only reached when no exception has been thrown.
}
}
- }
- finally
- {
- if ( errorPumper != null )
- {
+ } finally {
+ if (errorPumper != null) {
errorPumper.close();
- if ( success )
- {
- handleException( errorPumper, "stderr" );
+ if (success) {
+ handleException(errorPumper, "stderr");
}
}
}
@@ -321,29 +277,22 @@ public Integer call()
}
}
}
-
};
}
- private static void handleException( final StreamPumper streamPumper, final String streamName )
- throws CommandLineException
- {
- if ( streamPumper.getException() != null )
- {
- throw new CommandLineException( String.format( "Failure processing %s.", streamName ),
- streamPumper.getException() );
-
+ private static void handleException(final StreamPumper streamPumper, final String streamName)
+ throws CommandLineException {
+ if (streamPumper.getException() != null) {
+ throw new CommandLineException(
+ String.format("Failure processing %s.", streamName), streamPumper.getException());
}
}
- private static void handleException( final StreamFeeder streamFeeder, final String streamName )
- throws CommandLineException
- {
- if ( streamFeeder.getException() != null )
- {
- throw new CommandLineException( String.format( "Failure processing %s.", streamName ),
- streamFeeder.getException() );
-
+ private static void handleException(final StreamFeeder streamFeeder, final String streamName)
+ throws CommandLineException {
+ if (streamFeeder.getException() != null) {
+ throw new CommandLineException(
+ String.format("Failure processing %s.", streamName), streamFeeder.getException());
}
}
@@ -354,14 +303,11 @@ private static void handleException( final StreamFeeder streamFeeder, final Stri
* with case-insensitive environment variables like Windows, all variable names will be normalized to upper case.
*
* @return The shell environment variables, can be empty but never null.
- * @throws IOException If the environment variables could not be queried from the shell.
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result since 2.0.2 System#getenv()
* will be used if available in the current running jvm.
*/
- public static Properties getSystemEnvVars()
- throws IOException
- {
- return getSystemEnvVars( !Os.isFamily( Os.FAMILY_WINDOWS ) );
+ public static Properties getSystemEnvVars() {
+ return getSystemEnvVars(!Os.isFamily(Os.FAMILY_WINDOWS));
}
/**
@@ -370,50 +316,37 @@ public static Properties getSystemEnvVars()
*
* @param caseSensitive Whether environment variable keys should be treated case-sensitively.
* @return Properties object of (possibly modified) envar keys mapped to their values.
- * @throws IOException .
* @see System#getenv() System.getenv() API, new in JDK 5.0, to get the same result since 2.0.2 System#getenv()
* will be used if available in the current running jvm.
*/
- public static Properties getSystemEnvVars( boolean caseSensitive )
- throws IOException
- {
+ public static Properties getSystemEnvVars(boolean caseSensitive) {
Properties envVars = new Properties();
Map envs = System.getenv();
- for ( String key : envs.keySet() )
- {
- String value = envs.get( key );
- if ( !caseSensitive )
- {
- key = key.toUpperCase( Locale.ENGLISH );
+ for (String key : envs.keySet()) {
+ String value = envs.get(key);
+ if (!caseSensitive) {
+ key = key.toUpperCase(Locale.ENGLISH);
}
- envVars.put( key, value );
+ envVars.put(key, value);
}
return envVars;
}
- public static boolean isAlive( Process p )
- {
- if ( p == null )
- {
+ public static boolean isAlive(Process p) {
+ if (p == null) {
return false;
}
- try
- {
+ try {
p.exitValue();
return false;
- }
- catch ( IllegalThreadStateException e )
- {
+ } catch (IllegalThreadStateException e) {
return true;
}
}
- public static String[] translateCommandline( String toProcess )
- throws Exception
- {
- if ( ( toProcess == null ) || ( toProcess.length() == 0 ) )
- {
+ public static String[] translateCommandline(String toProcess) throws Exception {
+ if ((toProcess == null) || (toProcess.length() == 0)) {
return new String[0];
}
@@ -423,72 +356,54 @@ public static String[] translateCommandline( String toProcess )
final int inQuote = 1;
final int inDoubleQuote = 2;
int state = normal;
- StringTokenizer tok = new StringTokenizer( toProcess, "\"\' ", true );
+ StringTokenizer tok = new StringTokenizer(toProcess, "\"\' ", true);
Vector v = new Vector();
StringBuilder current = new StringBuilder();
- while ( tok.hasMoreTokens() )
- {
+ while (tok.hasMoreTokens()) {
String nextTok = tok.nextToken();
- switch ( state )
- {
+ switch (state) {
case inQuote:
- if ( "\'".equals( nextTok ) )
- {
+ if ("\'".equals(nextTok)) {
state = normal;
- }
- else
- {
- current.append( nextTok );
+ } else {
+ current.append(nextTok);
}
break;
case inDoubleQuote:
- if ( "\"".equals( nextTok ) )
- {
+ if ("\"".equals(nextTok)) {
state = normal;
- }
- else
- {
- current.append( nextTok );
+ } else {
+ current.append(nextTok);
}
break;
default:
- if ( "\'".equals( nextTok ) )
- {
+ if ("\'".equals(nextTok)) {
state = inQuote;
- }
- else if ( "\"".equals( nextTok ) )
- {
+ } else if ("\"".equals(nextTok)) {
state = inDoubleQuote;
- }
- else if ( " ".equals( nextTok ) )
- {
- if ( current.length() != 0 )
- {
- v.addElement( current.toString() );
- current.setLength( 0 );
+ } else if (" ".equals(nextTok)) {
+ if (current.length() != 0) {
+ v.addElement(current.toString());
+ current.setLength(0);
}
- }
- else
- {
- current.append( nextTok );
+ } else {
+ current.append(nextTok);
}
break;
}
}
- if ( current.length() != 0 )
- {
- v.addElement( current.toString() );
+ if (current.length() != 0) {
+ v.addElement(current.toString());
}
- if ( ( state == inQuote ) || ( state == inDoubleQuote ) )
- {
- throw new CommandLineException( "unbalanced quotes in " + toProcess );
+ if ((state == inQuote) || (state == inDoubleQuote)) {
+ throw new CommandLineException("unbalanced quotes in " + toProcess);
}
String[] args = new String[v.size()];
- v.copyInto( args );
+ v.copyInto(args);
return args;
}
@@ -508,11 +423,9 @@ else if ( " ".equals( nextTok ) )
* {@link StringUtils#quoteAndEscape(String, char)} instead.
*/
@Deprecated
- @SuppressWarnings( { "JavaDoc", "deprecation" } )
- public static String quote( String argument )
- throws CommandLineException
- {
- return quote( argument, false, false, true );
+ @SuppressWarnings({"JavaDoc", "deprecation"})
+ public static String quote(String argument) throws CommandLineException {
+ return quote(argument, false, false, true);
}
/**
@@ -532,11 +445,9 @@ public static String quote( String argument )
* {@link StringUtils#quoteAndEscape(String, char)} instead.
*/
@Deprecated
- @SuppressWarnings( { "JavaDoc", "UnusedDeclaration", "deprecation" } )
- public static String quote( String argument, boolean wrapExistingQuotes )
- throws CommandLineException
- {
- return quote( argument, false, false, wrapExistingQuotes );
+ @SuppressWarnings({"JavaDoc", "UnusedDeclaration", "deprecation"})
+ public static String quote(String argument, boolean wrapExistingQuotes) throws CommandLineException {
+ return quote(argument, false, false, wrapExistingQuotes);
}
/**
@@ -551,48 +462,30 @@ public static String quote( String argument, boolean wrapExistingQuotes )
* {@link StringUtils#quoteAndEscape(String, char)} instead.
*/
@Deprecated
- @SuppressWarnings( { "JavaDoc" } )
- public static String quote( String argument, boolean escapeSingleQuotes, boolean escapeDoubleQuotes,
- boolean wrapExistingQuotes )
- throws CommandLineException
- {
- if ( argument.contains( "\"" ) )
- {
- if ( argument.contains( "\'" ) )
- {
- throw new CommandLineException( "Can't handle single and double quotes in same argument" );
- }
- else
- {
- if ( escapeSingleQuotes )
- {
+ @SuppressWarnings({"JavaDoc"})
+ public static String quote(
+ String argument, boolean escapeSingleQuotes, boolean escapeDoubleQuotes, boolean wrapExistingQuotes)
+ throws CommandLineException {
+ if (argument.contains("\"")) {
+ if (argument.contains("\'")) {
+ throw new CommandLineException("Can't handle single and double quotes in same argument");
+ } else {
+ if (escapeSingleQuotes) {
return "\\\'" + argument + "\\\'";
- }
- else if ( wrapExistingQuotes )
- {
+ } else if (wrapExistingQuotes) {
return '\'' + argument + '\'';
}
}
- }
- else if ( argument.contains( "\'" ) )
- {
- if ( escapeDoubleQuotes )
- {
+ } else if (argument.contains("\'")) {
+ if (escapeDoubleQuotes) {
return "\\\"" + argument + "\\\"";
- }
- else if ( wrapExistingQuotes )
- {
+ } else if (wrapExistingQuotes) {
return '\"' + argument + '\"';
}
- }
- else if ( argument.contains( " " ) )
- {
- if ( escapeDoubleQuotes )
- {
+ } else if (argument.contains(" ")) {
+ if (escapeDoubleQuotes) {
return "\\\"" + argument + "\\\"";
- }
- else
- {
+ } else {
return '\"' + argument + '\"';
}
}
@@ -600,32 +493,24 @@ else if ( argument.contains( " " ) )
return argument;
}
- public static String toString( String[] line )
- {
+ public static String toString(String[] line) {
// empty path return empty string
- if ( ( line == null ) || ( line.length == 0 ) )
- {
+ if ((line == null) || (line.length == 0)) {
return "";
}
// path containing one or more elements
final StringBuilder result = new StringBuilder();
- for ( int i = 0; i < line.length; i++ )
- {
- if ( i > 0 )
- {
- result.append( ' ' );
+ for (int i = 0; i < line.length; i++) {
+ if (i > 0) {
+ result.append(' ');
}
- try
- {
- result.append( StringUtils.quoteAndEscape( line[i], '\"' ) );
- }
- catch ( Exception e )
- {
- System.err.println( "Error quoting argument: " + e.getMessage() );
+ try {
+ result.append(StringUtils.quoteAndEscape(line[i], '\"'));
+ } catch (Exception e) {
+ System.err.println("Error quoting argument: " + e.getMessage());
}
}
return result.toString();
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/Commandline.java b/src/main/java/org/codehaus/plexus/util/cli/Commandline.java
index c06147a9..db145c50 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/Commandline.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/Commandline.java
@@ -57,13 +57,6 @@
* ====================================================================
*/
-import org.codehaus.plexus.util.Os;
-import org.codehaus.plexus.util.StringUtils;
-import org.codehaus.plexus.util.cli.shell.BourneShell;
-import org.codehaus.plexus.util.cli.shell.CmdShell;
-import org.codehaus.plexus.util.cli.shell.CommandShell;
-import org.codehaus.plexus.util.cli.shell.Shell;
-
import java.io.File;
import java.io.IOException;
import java.util.Collections;
@@ -72,12 +65,19 @@
import java.util.Properties;
import java.util.Vector;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.cli.shell.BourneShell;
+import org.codehaus.plexus.util.cli.shell.CmdShell;
+import org.codehaus.plexus.util.cli.shell.CommandShell;
+import org.codehaus.plexus.util.cli.shell.Shell;
+
/**
* Commandline objects help handling command lines specifying processes to execute.
- *
+ *
* The class can be used to define a command line as nested elements or as a helper to define a command line by an
* application.
- *
+ *
*
* <someelement>
* <acommandline executable="/executable/to/run">
@@ -87,16 +87,14 @@
* </acommandline>
* </someelement>
*
- *
+ *
* The element someelement must provide a method createAcommandline which returns an instance
* of this class.
*
* @author thomas.haas@softwired-inc.com
* @author Stefan Bodewig
*/
-public class Commandline
- implements Cloneable
-{
+public class Commandline implements Cloneable {
/**
* @deprecated Use {@link org.codehaus.plexus.util.Os} class instead.
*/
@@ -113,7 +111,7 @@ public class Commandline
// protected Vector envVars = new Vector();
// synchronized added to preserve synchronize of Vector class
- protected Map envVars = Collections.synchronizedMap( new LinkedHashMap() );
+ protected Map envVars = Collections.synchronizedMap(new LinkedHashMap());
private long pid = -1;
@@ -139,25 +137,19 @@ public class Commandline
* @param toProcess sh to process
* @param shell Shell to use
*/
- public Commandline( String toProcess, Shell shell )
- {
+ public Commandline(String toProcess, Shell shell) {
this.shell = shell;
String[] tmp = new String[0];
- try
- {
- tmp = CommandLineUtils.translateCommandline( toProcess );
- }
- catch ( Exception e )
- {
- System.err.println( "Error translating Commandline." );
- }
- if ( ( tmp != null ) && ( tmp.length > 0 ) )
- {
- setExecutable( tmp[0] );
- for ( int i = 1; i < tmp.length; i++ )
- {
- createArgument().setValue( tmp[i] );
+ try {
+ tmp = CommandLineUtils.translateCommandline(toProcess);
+ } catch (Exception e) {
+ System.err.println("Error translating Commandline.");
+ }
+ if ((tmp != null) && (tmp.length > 0)) {
+ setExecutable(tmp[0]);
+ for (int i = 1; i < tmp.length; i++) {
+ createArgument().setValue(tmp[i]);
}
}
}
@@ -167,8 +159,7 @@ public Commandline( String toProcess, Shell shell )
* generating code for remote execution.
* @param shell the Shell
*/
- public Commandline( Shell shell )
- {
+ public Commandline(Shell shell) {
this.shell = shell;
}
@@ -177,24 +168,18 @@ public Commandline( Shell shell )
*
* @param toProcess the process
*/
- public Commandline( String toProcess )
- {
+ public Commandline(String toProcess) {
setDefaultShell();
String[] tmp = new String[0];
- try
- {
- tmp = CommandLineUtils.translateCommandline( toProcess );
- }
- catch ( Exception e )
- {
- System.err.println( "Error translating Commandline." );
- }
- if ( ( tmp != null ) && ( tmp.length > 0 ) )
- {
- setExecutable( tmp[0] );
- for ( int i = 1; i < tmp.length; i++ )
- {
- createArgument().setValue( tmp[i] );
+ try {
+ tmp = CommandLineUtils.translateCommandline(toProcess);
+ } catch (Exception e) {
+ System.err.println("Error translating Commandline.");
+ }
+ if ((tmp != null) && (tmp.length > 0)) {
+ setExecutable(tmp[0]);
+ for (int i = 1; i < tmp.length; i++) {
+ createArgument().setValue(tmp[i]);
}
}
}
@@ -202,23 +187,19 @@ public Commandline( String toProcess )
/**
* Create a new command line object.
*/
- public Commandline()
- {
+ public Commandline() {
setDefaultShell();
}
- public long getPid()
- {
- if ( pid == -1 )
- {
- pid = Long.parseLong( String.valueOf( System.currentTimeMillis() ) );
+ public long getPid() {
+ if (pid == -1) {
+ pid = Long.parseLong(String.valueOf(System.currentTimeMillis()));
}
return pid;
}
- public void setPid( long pid )
- {
+ public void setPid(long pid) {
this.pid = pid;
}
@@ -228,31 +209,26 @@ public void setPid( long pid )
// This class is there to support the srcfile and targetfile
// elements of <execon> and <transform> - don't know
// whether there might be additional use cases.
--SB
- public class Marker
- {
+ public class Marker {
private int position;
private int realPos = -1;
- Marker( int position )
- {
+ Marker(int position) {
this.position = position;
}
/**
* @return the number of arguments that preceded this marker.
- *
+ *
* The name of the executable - if set - is counted as the very first argument.
*/
- public int getPosition()
- {
- if ( realPos == -1 )
- {
- realPos = ( getLiteralExecutable() == null ? 0 : 1 );
- for ( int i = 0; i < position; i++ )
- {
- Arg arg = arguments.elementAt( i );
+ public int getPosition() {
+ if (realPos == -1) {
+ realPos = (getLiteralExecutable() == null ? 0 : 1);
+ for (int i = 0; i < position; i++) {
+ Arg arg = arguments.elementAt(i);
realPos += arg.getParts().length;
}
}
@@ -265,29 +241,22 @@ public int getPosition()
* Sets the shell or command-line interpreter for the detected operating system, and the shell arguments.
*
*/
- private void setDefaultShell()
- {
+ private void setDefaultShell() {
// If this is windows set the shell to command.com or cmd.exe with correct arguments.
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
- if ( Os.isFamily( Os.FAMILY_WIN9X ) )
- {
- setShell( new CommandShell() );
- }
- else
- {
- setShell( new CmdShell() );
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+ if (Os.isFamily(Os.FAMILY_WIN9X)) {
+ setShell(new CommandShell());
+ } else {
+ setShell(new CmdShell());
}
- }
- else
- {
- setShell( new BourneShell() );
+ } else {
+ setShell(new BourneShell());
}
}
/**
* Creates an argument object.
- *
+ *
* Each commandline object has at most one instance of the argument class. This method calls
* this.createArgument(false).
*
@@ -296,14 +265,13 @@ private void setDefaultShell()
* @deprecated Use {@link Commandline#createArg()} instead
*/
@Deprecated
- public Argument createArgument()
- {
- return this.createArgument( false );
+ public Argument createArgument() {
+ return this.createArgument(false);
}
/**
* Creates an argument object and adds it to our list of args.
- *
+ *
* Each commandline object has at most one instance of the argument class.
*
* @param insertAtStart if true, the argument is inserted at the beginning of the list of args, otherwise it is
@@ -312,52 +280,43 @@ public Argument createArgument()
* @return Argument the argument Object
*/
@Deprecated
- public Argument createArgument( boolean insertAtStart )
- {
+ public Argument createArgument(boolean insertAtStart) {
Argument argument = new Argument();
- if ( insertAtStart )
- {
- arguments.insertElementAt( argument, 0 );
- }
- else
- {
- arguments.addElement( argument );
+ if (insertAtStart) {
+ arguments.insertElementAt(argument, 0);
+ } else {
+ arguments.addElement(argument);
}
return argument;
}
/**
* Creates an argument object.
- *
+ *
* Each commandline object has at most one instance of the argument class. This method calls
* this.createArgument(false).
*
* @return the argument object.
* @see #createArgument(boolean)
*/
- public Arg createArg()
- {
- return this.createArg( false );
+ public Arg createArg() {
+ return this.createArg(false);
}
/**
* @return Creates an argument object and adds it to our list of args.
- *
+ *
* Each commandline object has at most one instance of the argument class.
*
* @param insertAtStart if true, the argument is inserted at the beginning of the list of args, otherwise it is
* appended.
*/
- public Arg createArg( boolean insertAtStart )
- {
+ public Arg createArg(boolean insertAtStart) {
Arg argument = new Argument();
- if ( insertAtStart )
- {
- arguments.insertElementAt( argument, 0 );
- }
- else
- {
- arguments.addElement( argument );
+ if (insertAtStart) {
+ arguments.insertElementAt(argument, 0);
+ } else {
+ arguments.addElement(argument);
}
return argument;
}
@@ -366,9 +325,8 @@ public Arg createArg( boolean insertAtStart )
* @param argument the argument
* @see #addArg(Arg,boolean)
*/
- public void addArg( Arg argument )
- {
- this.addArg( argument, false );
+ public void addArg(Arg argument) {
+ this.addArg(argument, false);
}
/**
@@ -377,15 +335,11 @@ public void addArg( Arg argument )
* @param insertAtStart if true, the argument is inserted at the beginning of the list of args, otherwise it is
* appended.
*/
- public void addArg( Arg argument, boolean insertAtStart )
- {
- if ( insertAtStart )
- {
- arguments.insertElementAt( argument, 0 );
- }
- else
- {
- arguments.addElement( argument );
+ public void addArg(Arg argument, boolean insertAtStart) {
+ if (insertAtStart) {
+ arguments.insertElementAt(argument, 0);
+ } else {
+ arguments.addElement(argument);
}
}
@@ -393,17 +347,15 @@ public void addArg( Arg argument, boolean insertAtStart )
* Sets the executable to run.
* @param executable the executable
*/
- public void setExecutable( String executable )
- {
- shell.setExecutable( executable );
+ public void setExecutable(String executable) {
+ shell.setExecutable(executable);
this.executable = executable;
}
/**
* @return Executable to be run, as a literal string (no shell quoting/munging)
*/
- public String getLiteralExecutable()
- {
+ public String getLiteralExecutable() {
return executable;
}
@@ -413,23 +365,19 @@ public String getLiteralExecutable()
*
* @return Executable to be run, quoted for shell interpretation
*/
- public String getExecutable()
- {
+ public String getExecutable() {
String exec = shell.getExecutable();
- if ( exec == null )
- {
+ if (exec == null) {
exec = executable;
}
return exec;
}
- public void addArguments( String[] line )
- {
- for ( String aLine : line )
- {
- createArgument().setValue( aLine );
+ public void addArguments(String[] line) {
+ for (String aLine : line) {
+ createArgument().setValue(aLine);
}
}
@@ -438,27 +386,22 @@ public void addArguments( String[] line )
* @param name name
* @param value value
*/
- public void addEnvironment( String name, String value )
- {
+ public void addEnvironment(String name, String value) {
// envVars.add( name + "=" + value );
- envVars.put( name, value );
+ envVars.put(name, value);
}
/**
* Add system environment variables
* @throws Exception if error
*/
- public void addSystemEnvironment()
- throws Exception
- {
+ public void addSystemEnvironment() throws Exception {
Properties systemEnvVars = CommandLineUtils.getSystemEnvVars();
- for ( Object o : systemEnvVars.keySet() )
- {
+ for (Object o : systemEnvVars.keySet()) {
String key = (String) o;
- if ( !envVars.containsKey( key ) )
- {
- addEnvironment( key, systemEnvVars.getProperty( key ) );
+ if (!envVars.containsKey(key)) {
+ addEnvironment(key, systemEnvVars.getProperty(key));
}
}
}
@@ -467,23 +410,17 @@ public void addSystemEnvironment()
* @return String[] Return the list of environment variables
* @throws CommandLineException if error
*/
- public String[] getEnvironmentVariables()
- throws CommandLineException
- {
- try
- {
+ public String[] getEnvironmentVariables() throws CommandLineException {
+ try {
addSystemEnvironment();
- }
- catch ( Exception e )
- {
- throw new CommandLineException( "Error setting up environmental variables", e );
+ } catch (Exception e) {
+ throw new CommandLineException("Error setting up environmental variables", e);
}
String[] environmentVars = new String[envVars.size()];
int i = 0;
- for ( Object o : envVars.keySet() )
- {
+ for (Object o : envVars.keySet()) {
String name = (String) o;
- String value = envVars.get( name );
+ String value = envVars.get(name);
environmentVars[i] = name + "=" + value;
i++;
}
@@ -494,10 +431,8 @@ public String[] getEnvironmentVariables()
* @return Returns the executable and all defined arguments.
* For Windows Family, {@link Commandline#getShellCommandline()} is returned
*/
- public String[] getCommandline()
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
+ public String[] getCommandline() {
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
return getShellCommandline();
}
@@ -508,87 +443,76 @@ public String[] getCommandline()
* Returns the executable and all defined arguments.
* @return the command line as array not escaped neither quoted
*/
- public String[] getRawCommandline()
- {
+ public String[] getRawCommandline() {
final String[] args = getArguments();
String executable = getLiteralExecutable();
- if ( executable == null )
- {
+ if (executable == null) {
return args;
}
final String[] result = new String[args.length + 1];
result[0] = executable;
- System.arraycopy( args, 0, result, 1, args.length );
+ System.arraycopy(args, 0, result, 1, args.length);
return result;
}
- /**
+ /**
* Returns the shell, executable and all defined arguments. Shell usage is only desirable when generating code for
* remote execution.
* @return the command line as array
*/
- public String[] getShellCommandline()
- {
+ public String[] getShellCommandline() {
// TODO: Provided only for backward compat. with <= 1.4
verifyShellState();
- return getShell().getShellCommandLine( getArguments() ).toArray( new String[0] );
+ return getShell().getShellCommandLine(getArguments()).toArray(new String[0]);
}
/**
* @return Returns all arguments defined by addLine, addValue or the argument object.
*/
- public String[] getArguments()
- {
- Vector result = new Vector<>( arguments.size() * 2 );
- for ( int i = 0; i < arguments.size(); i++ )
- {
- Arg arg = arguments.elementAt( i );
+ public String[] getArguments() {
+ Vector result = new Vector<>(arguments.size() * 2);
+ for (int i = 0; i < arguments.size(); i++) {
+ Arg arg = arguments.elementAt(i);
String[] s = arg.getParts();
- if ( s != null )
- {
- for ( String value : s )
- {
- result.addElement( value );
+ if (s != null) {
+ for (String value : s) {
+ result.addElement(value);
}
}
}
String[] res = new String[result.size()];
- result.copyInto( res );
+ result.copyInto(res);
return res;
}
@Override
- public String toString()
- {
- return StringUtils.join( getShellCommandline(), " " );
+ public String toString() {
+ return StringUtils.join(getShellCommandline(), " ");
}
- public int size()
- {
+ public int size() {
return getCommandline().length;
}
@Override
- public Object clone()
- {
- Commandline c = new Commandline( (Shell) shell.clone() );
+ public Object clone() {
+ Commandline c = new Commandline((Shell) shell.clone());
c.executable = executable;
c.workingDir = workingDir;
- c.addArguments( getArguments() );
+ c.addArguments(getArguments());
return c;
}
/**
* Clear out the whole command line.
*/
- public void clear()
- {
+ public void clear() {
executable = null;
workingDir = null;
- shell.setExecutable( null );
+ shell.setExecutable(null);
shell.clearArguments();
arguments.removeAllElements();
}
@@ -596,8 +520,7 @@ public void clear()
/**
* Clear out the arguments but leave the executable in place for another operation.
*/
- public void clearArgs()
- {
+ public void clearArgs() {
arguments.removeAllElements();
}
@@ -608,37 +531,32 @@ public void clearArgs()
*
* @return Return a marker.
*/
- public Marker createMarker()
- {
- return new Marker( arguments.size() );
+ public Marker createMarker() {
+ return new Marker(arguments.size());
}
/**
* Sets execution directory.
* @param path the working directory as String
*/
- public void setWorkingDirectory( String path )
- {
- shell.setWorkingDirectory( path );
- workingDir = new File( path );
+ public void setWorkingDirectory(String path) {
+ shell.setWorkingDirectory(path);
+ workingDir = new File(path);
}
/**
* Sets execution directory.
* @param workingDirectory the File used as working directory
*/
- public void setWorkingDirectory( File workingDirectory )
- {
- shell.setWorkingDirectory( workingDirectory );
+ public void setWorkingDirectory(File workingDirectory) {
+ shell.setWorkingDirectory(workingDirectory);
workingDir = workingDirectory;
}
- public File getWorkingDirectory()
- {
+ public File getWorkingDirectory() {
File workDir = shell.getWorkingDirectory();
- if ( workDir == null )
- {
+ if (workDir == null) {
workDir = workingDir;
}
@@ -650,9 +568,7 @@ public File getWorkingDirectory()
* @return the Process
* @throws CommandLineException if error
*/
- public Process execute()
- throws CommandLineException
- {
+ public Process execute() throws CommandLineException {
// TODO: Provided only for backward compat. with <= 1.4
verifyShellState();
@@ -664,31 +580,22 @@ public Process execute()
File workingDir = shell.getWorkingDirectory();
- try
- {
- if ( workingDir == null )
- {
- process = Runtime.getRuntime().exec( getCommandline(), environment, workingDir );
- }
- else
- {
- if ( !workingDir.exists() )
- {
- throw new CommandLineException( "Working directory \"" + workingDir.getPath()
- + "\" does not exist!" );
- }
- else if ( !workingDir.isDirectory() )
- {
- throw new CommandLineException( "Path \"" + workingDir.getPath()
- + "\" does not specify a directory." );
+ try {
+ if (workingDir == null) {
+ process = Runtime.getRuntime().exec(getCommandline(), environment, workingDir);
+ } else {
+ if (!workingDir.exists()) {
+ throw new CommandLineException(
+ "Working directory \"" + workingDir.getPath() + "\" does not exist!");
+ } else if (!workingDir.isDirectory()) {
+ throw new CommandLineException(
+ "Path \"" + workingDir.getPath() + "\" does not specify a directory.");
}
- process = Runtime.getRuntime().exec( getCommandline(), environment, workingDir );
+ process = Runtime.getRuntime().exec(getCommandline(), environment, workingDir);
}
- }
- catch ( IOException ex )
- {
- throw new CommandLineException( "Error while executing process.", ex );
+ } catch (IOException ex) {
+ throw new CommandLineException("Error while executing process.", ex);
}
return process;
@@ -698,22 +605,17 @@ else if ( !workingDir.isDirectory() )
* @deprecated Remove once backward compat with plexus-utils <= 1.4 is no longer a consideration
*/
@Deprecated
- private void verifyShellState()
- {
- if ( shell.getWorkingDirectory() == null )
- {
- shell.setWorkingDirectory( workingDir );
+ private void verifyShellState() {
+ if (shell.getWorkingDirectory() == null) {
+ shell.setWorkingDirectory(workingDir);
}
- if ( shell.getOriginalExecutable() == null )
- {
- shell.setExecutable( executable );
+ if (shell.getOriginalExecutable() == null) {
+ shell.setExecutable(executable);
}
}
- public Properties getSystemEnvVars()
- throws Exception
- {
+ public Properties getSystemEnvVars() throws Exception {
return CommandLineUtils.getSystemEnvVars();
}
@@ -724,20 +626,18 @@ public Properties getSystemEnvVars()
* @param shell Shell to use
* @since 1.2
*/
- public void setShell( Shell shell )
- {
+ public void setShell(Shell shell) {
this.shell = shell;
}
/**
* Get the shell to be used in this command line. Shell usage is only desirable when generating code for remote
* execution.
- *
+ *
* @since 1.2
* @return the Shell
*/
- public Shell getShell()
- {
+ public Shell getShell() {
return shell;
}
@@ -748,10 +648,8 @@ public Shell getShell()
* @deprecated Use {@link CommandLineUtils#translateCommandline(String)} instead.
*/
@Deprecated
- public static String[] translateCommandline( String toProcess )
- throws Exception
- {
- return CommandLineUtils.translateCommandline( toProcess );
+ public static String[] translateCommandline(String toProcess) throws Exception {
+ return CommandLineUtils.translateCommandline(toProcess);
}
/**
@@ -761,10 +659,8 @@ public static String[] translateCommandline( String toProcess )
* @deprecated Use {@link CommandLineUtils#quote(String)} instead.
*/
@Deprecated
- public static String quoteArgument( String argument )
- throws CommandLineException
- {
- return CommandLineUtils.quote( argument );
+ public static String quoteArgument(String argument) throws CommandLineException {
+ return CommandLineUtils.quote(argument);
}
/**
@@ -773,14 +669,11 @@ public static String quoteArgument( String argument )
* @return lines as single String
*/
@Deprecated
- public static String toString( String[] line )
- {
- return CommandLineUtils.toString( line );
+ public static String toString(String[] line) {
+ return CommandLineUtils.toString(line);
}
- public static class Argument
- implements Arg
- {
+ public static class Argument implements Arg {
private String[] parts;
/*
@@ -788,11 +681,9 @@ public static class Argument
* @see org.codehaus.plexus.util.cli.Argument#setValue(java.lang.String)
*/
@Override
- public void setValue( String value )
- {
- if ( value != null )
- {
- parts = new String[] { value };
+ public void setValue(String value) {
+ if (value != null) {
+ parts = new String[] {value};
}
}
@@ -801,19 +692,14 @@ public void setValue( String value )
* @see org.codehaus.plexus.util.cli.Argument#setLine(java.lang.String)
*/
@Override
- public void setLine( String line )
- {
- if ( line == null )
- {
+ public void setLine(String line) {
+ if (line == null) {
return;
}
- try
- {
- parts = CommandLineUtils.translateCommandline( line );
- }
- catch ( Exception e )
- {
- System.err.println( "Error translating Commandline." );
+ try {
+ parts = CommandLineUtils.translateCommandline(line);
+ } catch (Exception e) {
+ System.err.println("Error translating Commandline.");
}
}
@@ -822,9 +708,8 @@ public void setLine( String line )
* @see org.codehaus.plexus.util.cli.Argument#setFile(java.io.File)
*/
@Override
- public void setFile( File value )
- {
- parts = new String[] { value.getAbsolutePath() };
+ public void setFile(File value) {
+ parts = new String[] {value.getAbsolutePath()};
}
/*
@@ -832,8 +717,7 @@ public void setFile( File value )
* @see org.codehaus.plexus.util.cli.Argument#getParts()
*/
@Override
- public String[] getParts()
- {
+ public String[] getParts() {
return parts;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
index 802dfb02..3808db81 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/DefaultConsumer.java
@@ -22,20 +22,14 @@
* @author Emmanuel Venisse
*
*/
-public class DefaultConsumer
- implements StreamConsumer
-{
+public class DefaultConsumer implements StreamConsumer {
@Override
- public void consumeLine( String line )
- throws IOException
- {
- System.out.println( line );
+ public void consumeLine(String line) throws IOException {
+ System.out.println(line);
- if ( System.out.checkError() )
- {
- throw new IOException( String.format( "Failure printing line '%s' to stdout.", line ) );
+ if (System.out.checkError()) {
+ throw new IOException(String.format("Failure printing line '%s' to stdout.", line));
}
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java b/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
index 2db89002..565a87cf 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/EnhancedStringTokenizer.java
@@ -21,11 +21,10 @@
/**
* The java.util.StringTokenizer is horribly broken. Given the string 1,,,3,,4 (, delim) It will return 1,3,4 Which is
* clearly wrong - 1,EMPTY,EMPTY,3,EMPTY,4 is what it should return
- *
+ *
*
*/
-public final class EnhancedStringTokenizer
-{
+public final class EnhancedStringTokenizer {
private StringTokenizer cst = null;
String cdelim;
@@ -40,98 +39,73 @@ public final class EnhancedStringTokenizer
boolean delimLast = true;
- public EnhancedStringTokenizer( String str )
- {
- this( str, " \t\n\r\f", false );
+ public EnhancedStringTokenizer(String str) {
+ this(str, " \t\n\r\f", false);
}
- public EnhancedStringTokenizer( String str, String delim )
- {
- this( str, delim, false );
+ public EnhancedStringTokenizer(String str, String delim) {
+ this(str, delim, false);
}
- public EnhancedStringTokenizer( String str, String delim, boolean returnDelims )
- {
- cst = new StringTokenizer( str, delim, true );
+ public EnhancedStringTokenizer(String str, String delim, boolean returnDelims) {
+ cst = new StringTokenizer(str, delim, true);
cdelim = delim;
creturnDelims = returnDelims;
- cdelimSingleChar = ( delim.length() == 1 );
- cdelimChar = delim.charAt( 0 );
+ cdelimSingleChar = (delim.length() == 1);
+ cdelimChar = delim.charAt(0);
}
- public boolean hasMoreTokens()
- {
+ public boolean hasMoreTokens() {
return cst.hasMoreTokens();
}
- private String internalNextToken()
- {
- if ( lastToken != null )
- {
+ private String internalNextToken() {
+ if (lastToken != null) {
String last = lastToken;
lastToken = null;
return last;
}
String token = cst.nextToken();
- if ( isDelim( token ) )
- {
- if ( delimLast )
- {
+ if (isDelim(token)) {
+ if (delimLast) {
lastToken = token;
return "";
- }
- else
- {
+ } else {
delimLast = true;
return token;
}
- }
- else
- {
+ } else {
delimLast = false;
return token;
}
}
- public String nextToken()
- {
+ public String nextToken() {
String token = internalNextToken();
- if ( creturnDelims )
- {
+ if (creturnDelims) {
return token;
}
- if ( isDelim( token ) )
- {
+ if (isDelim(token)) {
return hasMoreTokens() ? internalNextToken() : "";
- }
- else
- {
+ } else {
return token;
}
}
- private boolean isDelim( String str )
- {
- if ( str.length() == 1 )
- {
- char ch = str.charAt( 0 );
- if ( cdelimSingleChar )
- {
- if ( cdelimChar == ch )
- {
+ private boolean isDelim(String str) {
+ if (str.length() == 1) {
+ char ch = str.charAt(0);
+ if (cdelimSingleChar) {
+ if (cdelimChar == ch) {
return true;
}
- }
- else
- {
- if ( cdelim.indexOf( ch ) >= 0 )
- {
+ } else {
+ if (cdelim.indexOf(ch) >= 0) {
return true;
}
}
}
return false;
-
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java b/src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java
index 453b566e..bb967b42 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/ShutdownHookUtils.java
@@ -24,36 +24,21 @@
*
* @author Kristian Rosenvold
*/
-class ShutdownHookUtils
-{
+class ShutdownHookUtils {
- public static void addShutDownHook( Thread hook )
- {
- try
- {
- Runtime.getRuntime().addShutdownHook( hook );
+ public static void addShutDownHook(Thread hook) {
+ try {
+ Runtime.getRuntime().addShutdownHook(hook);
+ } catch (IllegalStateException ignore) {
+ } catch (AccessControlException ignore) {
}
- catch ( IllegalStateException ignore )
- {
- }
- catch ( AccessControlException ignore )
- {
- }
-
}
- public static void removeShutdownHook( Thread hook )
- {
- try
- {
- Runtime.getRuntime().removeShutdownHook( hook );
- }
- catch ( IllegalStateException ignore )
- {
- }
- catch ( AccessControlException ignore )
- {
+ public static void removeShutdownHook(Thread hook) {
+ try {
+ Runtime.getRuntime().removeShutdownHook(hook);
+ } catch (IllegalStateException ignore) {
+ } catch (AccessControlException ignore) {
}
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
index e01bda2c..7367ccdc 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamConsumer.java
@@ -52,7 +52,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
********************************************************************************/
-
import java.io.IOException;
/**
@@ -64,14 +63,12 @@
* @author Paul Julius
*
*/
-public interface StreamConsumer
-{
+public interface StreamConsumer {
/**
* Called when the StreamPumper pumps a line from the Stream.
- *
+ *
* @param line The line to be consumed.
* @throws IOException if consuming {@code line} fails.
*/
- public void consumeLine( String line )
- throws IOException;
+ public void consumeLine(String line) throws IOException;
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java b/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
index 270d7d8b..81289044 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamFeeder.java
@@ -26,9 +26,7 @@
* @author Trygve Laugstøl
*
*/
-public class StreamFeeder
- extends AbstractStreamHandler
-{
+public class StreamFeeder extends AbstractStreamHandler {
private InputStream input;
@@ -42,33 +40,24 @@ public class StreamFeeder
* @param input Stream to read from
* @param output Stream to write to
*/
- public StreamFeeder( InputStream input, OutputStream output )
- {
+ public StreamFeeder(InputStream input, OutputStream output) {
super();
this.input = input;
this.output = output;
}
@Override
- public void run()
- {
- try
- {
+ public void run() {
+ try {
feed();
- }
- catch ( Throwable ex )
- {
- if ( exception == null )
- {
+ } catch (Throwable ex) {
+ if (exception == null) {
exception = ex;
}
- }
- finally
- {
+ } finally {
close();
- synchronized ( this )
- {
+ synchronized (this) {
setDone();
this.notifyAll();
@@ -76,20 +65,13 @@ public void run()
}
}
- public void close()
- {
- if ( input != null )
- {
- synchronized ( input )
- {
- try
- {
+ public void close() {
+ if (input != null) {
+ synchronized (input) {
+ try {
input.close();
- }
- catch ( IOException ex )
- {
- if ( exception == null )
- {
+ } catch (IOException ex) {
+ if (exception == null) {
exception = ex;
}
}
@@ -98,18 +80,12 @@ public void close()
}
}
- if ( output != null )
- {
- synchronized ( output )
- {
- try
- {
+ if (output != null) {
+ synchronized (output) {
+ try {
output.close();
- }
- catch ( IOException ex )
- {
- if ( exception == null )
- {
+ } catch (IOException ex) {
+ if (exception == null) {
exception = ex;
}
}
@@ -123,24 +99,18 @@ public void close()
* @since 3.1.0
* @return the Exception
*/
- public Throwable getException()
- {
+ public Throwable getException() {
return exception;
}
- private void feed()
- throws IOException
- {
+ private void feed() throws IOException {
boolean flush = false;
int data = input.read();
- while ( !isDone() && data != -1 )
- {
- synchronized ( output )
- {
- if ( !isDisabled() )
- {
- output.write( data );
+ while (!isDone() && data != -1) {
+ synchronized (output) {
+ if (!isDisabled()) {
+ output.write(data);
flush = true;
}
@@ -148,10 +118,8 @@ private void feed()
}
}
- if ( flush )
- {
+ if (flush) {
output.flush();
}
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java b/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
index 12126e88..9c4865ff 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/StreamPumper.java
@@ -84,9 +84,7 @@
*
* @since June 11, 2001
*/
-public class StreamPumper
- extends AbstractStreamHandler
-{
+public class StreamPumper extends AbstractStreamHandler {
private final BufferedReader in;
private final StreamConsumer consumer;
@@ -97,93 +95,68 @@ public class StreamPumper
private static final int SIZE = 1024;
- public StreamPumper( InputStream in )
- {
- this( in, (StreamConsumer) null );
+ public StreamPumper(InputStream in) {
+ this(in, (StreamConsumer) null);
}
- public StreamPumper( InputStream in, StreamConsumer consumer )
- {
- this( in, null, consumer );
+ public StreamPumper(InputStream in, StreamConsumer consumer) {
+ this(in, null, consumer);
}
- public StreamPumper( InputStream in, PrintWriter writer )
- {
- this( in, writer, null );
+ public StreamPumper(InputStream in, PrintWriter writer) {
+ this(in, writer, null);
}
- public StreamPumper( InputStream in, PrintWriter writer, StreamConsumer consumer )
- {
+ public StreamPumper(InputStream in, PrintWriter writer, StreamConsumer consumer) {
super();
- this.in = new BufferedReader( new InputStreamReader( in ), SIZE );
+ this.in = new BufferedReader(new InputStreamReader(in), SIZE);
this.out = writer;
this.consumer = consumer;
}
@Override
- public void run()
- {
+ public void run() {
boolean outError = out != null ? out.checkError() : false;
- try
- {
- for ( String line = in.readLine(); line != null; line = in.readLine() )
- {
- try
- {
- if ( exception == null && consumer != null && !isDisabled() )
- {
- consumer.consumeLine( line );
+ try {
+ for (String line = in.readLine(); line != null; line = in.readLine()) {
+ try {
+ if (exception == null && consumer != null && !isDisabled()) {
+ consumer.consumeLine(line);
}
- }
- catch ( Exception t )
- {
+ } catch (Exception t) {
exception = t;
}
- if ( out != null && !outError )
- {
- out.println( line );
+ if (out != null && !outError) {
+ out.println(line);
out.flush();
- if ( out.checkError() )
- {
+ if (out.checkError()) {
outError = true;
- try
- {
+ try {
// Thrown to fill in stack trace elements.
- throw new IOException( String.format( "Failure printing line '%s'.", line ) );
- }
- catch ( final IOException e )
- {
+ throw new IOException(String.format("Failure printing line '%s'.", line));
+ } catch (final IOException e) {
exception = e;
}
}
}
}
- }
- catch ( IOException e )
- {
+ } catch (IOException e) {
exception = e;
- }
- finally
- {
- try
- {
+ } finally {
+ try {
in.close();
- }
- catch ( final IOException e2 )
- {
- if ( exception == null )
- {
+ } catch (final IOException e2) {
+ if (exception == null) {
exception = e2;
}
}
- synchronized ( this )
- {
+ synchronized (this) {
setDone();
this.notifyAll();
@@ -191,50 +164,37 @@ public void run()
}
}
- public void flush()
- {
- if ( out != null )
- {
+ public void flush() {
+ if (out != null) {
out.flush();
- if ( out.checkError() && exception == null )
- {
- try
- {
+ if (out.checkError() && exception == null) {
+ try {
// Thrown to fill in stack trace elements.
- throw new IOException( "Failure flushing output." );
- }
- catch ( final IOException e )
- {
+ throw new IOException("Failure flushing output.");
+ } catch (final IOException e) {
exception = e;
}
}
}
}
- public void close()
- {
- if ( out != null )
- {
+ public void close() {
+ if (out != null) {
out.close();
- if ( out.checkError() && exception == null )
- {
- try
- {
+ if (out.checkError() && exception == null) {
+ try {
// Thrown to fill in stack trace elements.
- throw new IOException( "Failure closing output." );
- }
- catch ( final IOException e )
- {
+ throw new IOException("Failure closing output.");
+ } catch (final IOException e) {
exception = e;
}
}
}
}
- public Exception getException()
- {
+ public Exception getException() {
return exception;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java b/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
index ed24136e..b8e6cc2e 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/WriterStreamConsumer.java
@@ -23,20 +23,16 @@
* @author Jason van Zyl
*
*/
-public class WriterStreamConsumer
- implements StreamConsumer
-{
+public class WriterStreamConsumer implements StreamConsumer {
private PrintWriter writer;
- public WriterStreamConsumer( Writer writer )
- {
- this.writer = new PrintWriter( writer );
+ public WriterStreamConsumer(Writer writer) {
+ this.writer = new PrintWriter(writer);
}
@Override
- public void consumeLine( String line )
- {
- writer.println( line );
+ public void consumeLine(String line) {
+ writer.println(line);
writer.flush();
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
index 089bc6fd..912a431b 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/BourneShell.java
@@ -16,83 +16,71 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.Os;
-
import java.util.ArrayList;
import java.util.List;
+import org.codehaus.plexus.util.Os;
+
/**
* @author Jason van Zyl
*
*/
-public class BourneShell
- extends Shell
-{
+public class BourneShell extends Shell {
- public BourneShell()
- {
- this( false );
+ public BourneShell() {
+ this(false);
}
- public BourneShell( boolean isLoginShell )
- {
- setUnconditionalQuoting( true );
- setShellCommand( "/bin/sh" );
- setArgumentQuoteDelimiter( '\'' );
- setExecutableQuoteDelimiter( '\'' );
- setSingleQuotedArgumentEscaped( true );
- setSingleQuotedExecutableEscaped( false );
- setQuotedExecutableEnabled( true );
- setArgumentEscapePattern( "'\\%s'" );
-
- if ( isLoginShell )
- {
- addShellArg( "-l" );
+ public BourneShell(boolean isLoginShell) {
+ setUnconditionalQuoting(true);
+ setShellCommand("/bin/sh");
+ setArgumentQuoteDelimiter('\'');
+ setExecutableQuoteDelimiter('\'');
+ setSingleQuotedArgumentEscaped(true);
+ setSingleQuotedExecutableEscaped(false);
+ setQuotedExecutableEnabled(true);
+ setArgumentEscapePattern("'\\%s'");
+
+ if (isLoginShell) {
+ addShellArg("-l");
}
}
/** {@inheritDoc} */
@Override
- public String getExecutable()
- {
- if ( Os.isFamily( Os.FAMILY_WINDOWS ) )
- {
+ public String getExecutable() {
+ if (Os.isFamily(Os.FAMILY_WINDOWS)) {
return super.getExecutable();
}
- return quoteOneItem( super.getOriginalExecutable(), true );
+ return quoteOneItem(super.getOriginalExecutable(), true);
}
@Override
- public List getShellArgsList()
- {
+ public List getShellArgsList() {
List shellArgs = new ArrayList();
List existingShellArgs = super.getShellArgsList();
- if ( ( existingShellArgs != null ) && !existingShellArgs.isEmpty() )
- {
- shellArgs.addAll( existingShellArgs );
+ if ((existingShellArgs != null) && !existingShellArgs.isEmpty()) {
+ shellArgs.addAll(existingShellArgs);
}
- shellArgs.add( "-c" );
+ shellArgs.add("-c");
return shellArgs;
}
@Override
- public String[] getShellArgs()
- {
+ public String[] getShellArgs() {
String[] shellArgs = super.getShellArgs();
- if ( shellArgs == null )
- {
+ if (shellArgs == null) {
shellArgs = new String[0];
}
- if ( ( shellArgs.length > 0 ) && !shellArgs[shellArgs.length - 1].equals( "-c" ) )
- {
+ if ((shellArgs.length > 0) && !shellArgs[shellArgs.length - 1].equals("-c")) {
String[] newArgs = new String[shellArgs.length + 1];
- System.arraycopy( shellArgs, 0, newArgs, 0, shellArgs.length );
+ System.arraycopy(shellArgs, 0, newArgs, 0, shellArgs.length);
newArgs[shellArgs.length] = "-c";
shellArgs = newArgs;
@@ -102,19 +90,17 @@ public String[] getShellArgs()
}
@Override
- protected String getExecutionPreamble()
- {
- if ( getWorkingDirectoryAsString() == null )
- {
+ protected String getExecutionPreamble() {
+ if (getWorkingDirectoryAsString() == null) {
return null;
}
String dir = getWorkingDirectoryAsString();
StringBuilder sb = new StringBuilder();
- sb.append( "cd " );
+ sb.append("cd ");
- sb.append( quoteOneItem( dir, false ) );
- sb.append( " && " );
+ sb.append(quoteOneItem(dir, false));
+ sb.append(" && ");
return sb.toString();
}
@@ -139,17 +125,15 @@ protected String getExecutionPreamble()
* @return the path unified correctly for the Bourne shell.
*/
@Override
- protected String quoteOneItem( String path, boolean isExecutable )
- {
- if ( path == null )
- {
+ protected String quoteOneItem(String path, boolean isExecutable) {
+ if (path == null) {
return null;
}
StringBuilder sb = new StringBuilder();
- sb.append( "'" );
- sb.append( path.replace( "'", "'\"'\"'" ) );
- sb.append( "'" );
+ sb.append("'");
+ sb.append(path.replace("'", "'\"'\"'"));
+ sb.append("'");
return sb.toString();
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
index aa0af43a..2ce59c23 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/CmdShell.java
@@ -28,14 +28,11 @@
* @since 1.2
*
*/
-public class CmdShell
- extends Shell
-{
- public CmdShell()
- {
- setShellCommand( "cmd.exe" );
- setQuotedExecutableEnabled( true );
- setShellArgs( new String[] { "/X", "/C" } );
+public class CmdShell extends Shell {
+ public CmdShell() {
+ setShellCommand("cmd.exe");
+ setQuotedExecutableEnabled(true);
+ setShellArgs(new String[] {"/X", "/D", "/C"});
}
/**
@@ -77,13 +74,12 @@ public CmdShell()
*
*/
@Override
- public List getCommandLine( String executable, String[] arguments )
- {
+ public List getCommandLine(String executable, String[] arguments) {
StringBuilder sb = new StringBuilder();
- sb.append( "\"" );
- sb.append( super.getCommandLine( executable, arguments ).get( 0 ) );
- sb.append( "\"" );
+ sb.append("\"");
+ sb.append(super.getCommandLine(executable, arguments).get(0));
+ sb.append("\"");
- return Arrays.asList( new String[] { sb.toString() } );
+ return Arrays.asList(new String[] {sb.toString()});
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
index 4aa4c2af..947045f9 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/CommandShell.java
@@ -25,13 +25,9 @@
* @since 1.2
*
*/
-public class CommandShell
- extends Shell
-{
- public CommandShell()
- {
- setShellCommand( "command.com" );
- setShellArgs( new String[] { "/C" } );
+public class CommandShell extends Shell {
+ public CommandShell() {
+ setShellCommand("command.com");
+ setShellArgs(new String[] {"/C"});
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java b/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
index c3c911dd..03a6065c 100644
--- a/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
+++ b/src/main/java/org/codehaus/plexus/util/cli/shell/Shell.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import org.codehaus.plexus.util.StringUtils;
-
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.codehaus.plexus.util.StringUtils;
+
/**
* Class that abstracts the Shell functionality, with subclasses for shells that behave particularly, like
*
@@ -34,10 +34,8 @@
* @since 1.2
*
*/
-public class Shell
- implements Cloneable
-{
- private static final char[] DEFAULT_QUOTING_TRIGGER_CHARS = { ' ' };
+public class Shell implements Cloneable {
+ private static final char[] DEFAULT_QUOTING_TRIGGER_CHARS = {' '};
private String shellCommand;
@@ -72,8 +70,7 @@ public class Shell
*
* @param unconditionallyQuote see name
*/
- public void setUnconditionalQuoting( boolean unconditionallyQuote )
- {
+ public void setUnconditionalQuoting(boolean unconditionallyQuote) {
this.unconditionallyQuote = unconditionallyQuote;
}
@@ -82,8 +79,7 @@ public void setUnconditionalQuoting( boolean unconditionallyQuote )
*
* @param shellCommand see name
*/
- public void setShellCommand( String shellCommand )
- {
+ public void setShellCommand(String shellCommand) {
this.shellCommand = shellCommand;
}
@@ -92,8 +88,7 @@ public void setShellCommand( String shellCommand )
*
* @return the command
*/
- public String getShellCommand()
- {
+ public String getShellCommand() {
return shellCommand;
}
@@ -102,24 +97,19 @@ public String getShellCommand()
*
* @param shellArgs see name
*/
- public void setShellArgs( String[] shellArgs )
- {
+ public void setShellArgs(String[] shellArgs) {
this.shellArgs.clear();
- this.shellArgs.addAll( Arrays.asList( shellArgs ) );
+ this.shellArgs.addAll(Arrays.asList(shellArgs));
}
/**
* @return the shell arguments
*/
- public String[] getShellArgs()
- {
- if ( ( shellArgs == null ) || shellArgs.isEmpty() )
- {
+ public String[] getShellArgs() {
+ if ((shellArgs == null) || shellArgs.isEmpty()) {
return null;
- }
- else
- {
- return shellArgs.toArray( new String[0] );
+ } else {
+ return shellArgs.toArray(new String[0]);
}
}
@@ -130,139 +120,115 @@ public String[] getShellArgs()
* @param arguments arguments for the executable, not the shell
* @return List with one String object with executable and arguments quoted as needed
*/
- public List getCommandLine( String executable, String[] arguments )
- {
- return getRawCommandLine( executable, arguments );
+ public List getCommandLine(String executable, String[] arguments) {
+ return getRawCommandLine(executable, arguments);
}
- protected String quoteOneItem( String inputString, boolean isExecutable )
- {
- char[] escapeChars = getEscapeChars( isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped() );
- return StringUtils.quoteAndEscape( inputString,
- isExecutable ? getExecutableQuoteDelimiter() : getArgumentQuoteDelimiter(),
- escapeChars, getQuotingTriggerChars(), '\\', unconditionallyQuote );
+ protected String quoteOneItem(String inputString, boolean isExecutable) {
+ char[] escapeChars = getEscapeChars(isSingleQuotedExecutableEscaped(), isDoubleQuotedExecutableEscaped());
+ return StringUtils.quoteAndEscape(
+ inputString,
+ isExecutable ? getExecutableQuoteDelimiter() : getArgumentQuoteDelimiter(),
+ escapeChars,
+ getQuotingTriggerChars(),
+ '\\',
+ unconditionallyQuote);
}
- protected List getRawCommandLine( String executable, String[] arguments )
- {
+ protected List getRawCommandLine(String executable, String[] arguments) {
List commandLine = new ArrayList();
StringBuilder sb = new StringBuilder();
- if ( executable != null )
- {
+ if (executable != null) {
String preamble = getExecutionPreamble();
- if ( preamble != null )
- {
- sb.append( preamble );
+ if (preamble != null) {
+ sb.append(preamble);
}
- if ( isQuotedExecutableEnabled() )
- {
- sb.append( quoteOneItem( getOriginalExecutable(), true ) );
- }
- else
- {
- sb.append( getExecutable() );
+ if (isQuotedExecutableEnabled()) {
+ sb.append(quoteOneItem(getOriginalExecutable(), true));
+ } else {
+ sb.append(getExecutable());
}
}
- for ( String argument : arguments )
- {
- if ( sb.length() > 0 )
- {
- sb.append( " " );
+ for (String argument : arguments) {
+ if (sb.length() > 0) {
+ sb.append(" ");
}
- if ( isQuotedArgumentsEnabled() )
- {
- sb.append( quoteOneItem( argument, false ) );
- }
- else
- {
- sb.append( argument );
+ if (isQuotedArgumentsEnabled()) {
+ sb.append(quoteOneItem(argument, false));
+ } else {
+ sb.append(argument);
}
}
- commandLine.add( sb.toString() );
+ commandLine.add(sb.toString());
return commandLine;
}
- protected char[] getQuotingTriggerChars()
- {
+ protected char[] getQuotingTriggerChars() {
return DEFAULT_QUOTING_TRIGGER_CHARS;
}
- protected String getExecutionPreamble()
- {
+ protected String getExecutionPreamble() {
return null;
}
- protected char[] getEscapeChars( boolean includeSingleQuote, boolean includeDoubleQuote )
- {
- StringBuilder buf = new StringBuilder( 2 );
- if ( includeSingleQuote )
- {
- buf.append( '\'' );
+ protected char[] getEscapeChars(boolean includeSingleQuote, boolean includeDoubleQuote) {
+ StringBuilder buf = new StringBuilder(2);
+ if (includeSingleQuote) {
+ buf.append('\'');
}
- if ( includeDoubleQuote )
- {
- buf.append( '\"' );
+ if (includeDoubleQuote) {
+ buf.append('\"');
}
char[] result = new char[buf.length()];
- buf.getChars( 0, buf.length(), result, 0 );
+ buf.getChars(0, buf.length(), result, 0);
return result;
}
- protected boolean isDoubleQuotedArgumentEscaped()
- {
+ protected boolean isDoubleQuotedArgumentEscaped() {
return doubleQuotedArgumentEscaped;
}
- protected boolean isSingleQuotedArgumentEscaped()
- {
+ protected boolean isSingleQuotedArgumentEscaped() {
return singleQuotedArgumentEscaped;
}
- protected boolean isDoubleQuotedExecutableEscaped()
- {
+ protected boolean isDoubleQuotedExecutableEscaped() {
return doubleQuotedExecutableEscaped;
}
- protected boolean isSingleQuotedExecutableEscaped()
- {
+ protected boolean isSingleQuotedExecutableEscaped() {
return singleQuotedExecutableEscaped;
}
- protected void setArgumentQuoteDelimiter( char argQuoteDelimiter )
- {
+ protected void setArgumentQuoteDelimiter(char argQuoteDelimiter) {
this.argQuoteDelimiter = argQuoteDelimiter;
}
- protected char getArgumentQuoteDelimiter()
- {
+ protected char getArgumentQuoteDelimiter() {
return argQuoteDelimiter;
}
- protected void setExecutableQuoteDelimiter( char exeQuoteDelimiter )
- {
+ protected void setExecutableQuoteDelimiter(char exeQuoteDelimiter) {
this.exeQuoteDelimiter = exeQuoteDelimiter;
}
- protected char getExecutableQuoteDelimiter()
- {
+ protected char getExecutableQuoteDelimiter() {
return exeQuoteDelimiter;
}
- protected void setArgumentEscapePattern( String argumentEscapePattern )
- {
+ protected void setArgumentEscapePattern(String argumentEscapePattern) {
this.argumentEscapePattern = argumentEscapePattern;
}
- protected String getArgumentEscapePattern()
- {
+ protected String getArgumentEscapePattern() {
return argumentEscapePattern;
}
@@ -274,54 +240,44 @@ protected String getArgumentEscapePattern()
* @return List of String objects, whose array version is suitable to be used as argument of
* Runtime.getRuntime().exec()
*/
- public List getShellCommandLine( String[] arguments )
- {
+ public List getShellCommandLine(String[] arguments) {
List commandLine = new ArrayList();
- if ( getShellCommand() != null )
- {
- commandLine.add( getShellCommand() );
+ if (getShellCommand() != null) {
+ commandLine.add(getShellCommand());
}
- if ( getShellArgs() != null )
- {
- commandLine.addAll( getShellArgsList() );
+ if (getShellArgs() != null) {
+ commandLine.addAll(getShellArgsList());
}
- commandLine.addAll( getCommandLine( getOriginalExecutable(), arguments ) );
+ commandLine.addAll(getCommandLine(getOriginalExecutable(), arguments));
return commandLine;
-
}
- public List getShellArgsList()
- {
+ public List getShellArgsList() {
return shellArgs;
}
- public void addShellArg( String arg )
- {
- shellArgs.add( arg );
+ public void addShellArg(String arg) {
+ shellArgs.add(arg);
}
- public void setQuotedArgumentsEnabled( boolean quotedArgumentsEnabled )
- {
+ public void setQuotedArgumentsEnabled(boolean quotedArgumentsEnabled) {
this.quotedArgumentsEnabled = quotedArgumentsEnabled;
}
- public boolean isQuotedArgumentsEnabled()
- {
+ public boolean isQuotedArgumentsEnabled() {
return quotedArgumentsEnabled;
}
- public void setQuotedExecutableEnabled( boolean quotedExecutableEnabled )
- {
+ public void setQuotedExecutableEnabled(boolean quotedExecutableEnabled) {
this.quotedExecutableEnabled = quotedExecutableEnabled;
}
- public boolean isQuotedExecutableEnabled()
- {
+ public boolean isQuotedExecutableEnabled() {
return quotedExecutableEnabled;
}
@@ -329,27 +285,22 @@ public boolean isQuotedExecutableEnabled()
*
* @param executable Sets the executable to run.
*/
- public void setExecutable( String executable )
- {
- if ( ( executable == null ) || ( executable.length() == 0 ) )
- {
+ public void setExecutable(String executable) {
+ if ((executable == null) || (executable.length() == 0)) {
return;
}
- this.executable = executable.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
+ this.executable = executable.replace('/', File.separatorChar).replace('\\', File.separatorChar);
}
- public String getExecutable()
- {
+ public String getExecutable() {
return executable;
}
/**
* @param path Sets execution directory.
*/
- public void setWorkingDirectory( String path )
- {
- if ( path != null )
- {
+ public void setWorkingDirectory(String path) {
+ if (path != null) {
workingDir = path;
}
}
@@ -357,66 +308,54 @@ public void setWorkingDirectory( String path )
/**
* @param workingDir Sets execution directory.
*/
- public void setWorkingDirectory( File workingDir )
- {
- if ( workingDir != null )
- {
+ public void setWorkingDirectory(File workingDir) {
+ if (workingDir != null) {
this.workingDir = workingDir.getAbsolutePath();
}
}
- public File getWorkingDirectory()
- {
- return workingDir == null ? null : new File( workingDir );
+ public File getWorkingDirectory() {
+ return workingDir == null ? null : new File(workingDir);
}
- public String getWorkingDirectoryAsString()
- {
+ public String getWorkingDirectoryAsString() {
return workingDir;
}
- public void clearArguments()
- {
+ public void clearArguments() {
shellArgs.clear();
}
@Override
- public Object clone()
- {
+ public Object clone() {
Shell shell = new Shell();
- shell.setExecutable( getExecutable() );
- shell.setWorkingDirectory( getWorkingDirectory() );
- shell.setShellArgs( getShellArgs() );
+ shell.setExecutable(getExecutable());
+ shell.setWorkingDirectory(getWorkingDirectory());
+ shell.setShellArgs(getShellArgs());
return shell;
}
- public String getOriginalExecutable()
- {
+ public String getOriginalExecutable() {
return executable;
}
- public List getOriginalCommandLine( String executable, String[] arguments )
- {
- return getRawCommandLine( executable, arguments );
+ public List getOriginalCommandLine(String executable, String[] arguments) {
+ return getRawCommandLine(executable, arguments);
}
- protected void setDoubleQuotedArgumentEscaped( boolean doubleQuotedArgumentEscaped )
- {
+ protected void setDoubleQuotedArgumentEscaped(boolean doubleQuotedArgumentEscaped) {
this.doubleQuotedArgumentEscaped = doubleQuotedArgumentEscaped;
}
- protected void setDoubleQuotedExecutableEscaped( boolean doubleQuotedExecutableEscaped )
- {
+ protected void setDoubleQuotedExecutableEscaped(boolean doubleQuotedExecutableEscaped) {
this.doubleQuotedExecutableEscaped = doubleQuotedExecutableEscaped;
}
- protected void setSingleQuotedArgumentEscaped( boolean singleQuotedArgumentEscaped )
- {
+ protected void setSingleQuotedArgumentEscaped(boolean singleQuotedArgumentEscaped) {
this.singleQuotedArgumentEscaped = singleQuotedArgumentEscaped;
}
- protected void setSingleQuotedExecutableEscaped( boolean singleQuotedExecutableEscaped )
- {
+ protected void setSingleQuotedExecutableEscaped(boolean singleQuotedExecutableEscaped) {
this.singleQuotedExecutableEscaped = singleQuotedExecutableEscaped;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java b/src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java
index e350af9d..c4b99e44 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/CycleDetectedException.java
@@ -19,43 +19,34 @@
import java.util.Iterator;
import java.util.List;
-public class CycleDetectedException
- extends Exception
-{
+public class CycleDetectedException extends Exception {
private List cycle;
- public CycleDetectedException( final String message, final List cycle )
- {
- super( message );
+ public CycleDetectedException(final String message, final List cycle) {
+ super(message);
this.cycle = cycle;
-
}
- public List getCycle()
- {
+ public List getCycle() {
return cycle;
}
- public String cycleToString()
- {
+ public String cycleToString() {
final StringBuilder buffer = new StringBuilder();
- for ( Iterator iterator = cycle.iterator(); iterator.hasNext(); )
- {
- buffer.append( iterator.next() );
+ for (Iterator iterator = cycle.iterator(); iterator.hasNext(); ) {
+ buffer.append(iterator.next());
- if ( iterator.hasNext() )
- {
- buffer.append( " --> " );
+ if (iterator.hasNext()) {
+ buffer.append(" --> ");
}
}
return buffer.toString();
}
@Override
- public String getMessage()
- {
+ public String getMessage() {
return super.getMessage() + " " + cycleToString();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
index 6f810043..98c2f451 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/CycleDetector.java
@@ -26,31 +26,26 @@
* @author Michal Maczka
*
*/
-public class CycleDetector
-{
+public class CycleDetector {
- private final static Integer NOT_VISITED = 0;
+ private static final Integer NOT_VISITED = 0;
- private final static Integer VISITING = 1;
+ private static final Integer VISITING = 1;
- private final static Integer VISITED = 2;
+ private static final Integer VISITED = 2;
- public static List hasCycle( final DAG graph )
- {
+ public static List hasCycle(final DAG graph) {
final List vertices = graph.getVertices();
final Map vertexStateMap = new HashMap<>();
List retValue = null;
- for ( Vertex vertex : vertices )
- {
- if ( isNotVisited( vertex, vertexStateMap ) )
- {
- retValue = introducesCycle( vertex, vertexStateMap );
+ for (Vertex vertex : vertices) {
+ if (isNotVisited(vertex, vertexStateMap)) {
+ retValue = introducesCycle(vertex, vertexStateMap);
- if ( retValue != null )
- {
+ if (retValue != null) {
break;
}
}
@@ -67,14 +62,12 @@ public static List hasCycle( final DAG graph )
* @param vertexStateMap the vertex Map
* @return the found cycle
*/
- public static List introducesCycle( final Vertex vertex, final Map vertexStateMap )
- {
+ public static List introducesCycle(final Vertex vertex, final Map vertexStateMap) {
final LinkedList cycleStack = new LinkedList<>();
- final boolean hasCycle = dfsVisit( vertex, cycleStack, vertexStateMap );
+ final boolean hasCycle = dfsVisit(vertex, cycleStack, vertexStateMap);
- if ( hasCycle )
- {
+ if (hasCycle) {
// we have a situation like: [b, a, c, d, b, f, g, h].
// Label of Vertex which introduced the cycle is at the first position in the list
// We have to find second occurrence of this label and use its position in the list
@@ -83,11 +76,11 @@ public static List introducesCycle( final Vertex vertex, final Map cycle = cycleStack.subList( 0, pos + 1 );
+ final List cycle = cycleStack.subList(0, pos + 1);
- Collections.reverse( cycle );
+ Collections.reverse(cycle);
return cycle;
}
@@ -95,57 +88,47 @@ public static List introducesCycle( final Vertex vertex, final Map introducesCycle( final Vertex vertex )
- {
+ public static List introducesCycle(final Vertex vertex) {
final Map vertexStateMap = new HashMap<>();
- return introducesCycle( vertex, vertexStateMap );
+ return introducesCycle(vertex, vertexStateMap);
}
- private static boolean isNotVisited( final Vertex vertex, final Map vertexStateMap )
- {
- final Integer state = vertexStateMap.get( vertex );
+ private static boolean isNotVisited(final Vertex vertex, final Map vertexStateMap) {
+ final Integer state = vertexStateMap.get(vertex);
- return ( state == null ) || NOT_VISITED.equals( state );
+ return (state == null) || NOT_VISITED.equals(state);
}
- private static boolean isVisiting( final Vertex vertex, final Map vertexStateMap )
- {
- final Integer state = vertexStateMap.get( vertex );
+ private static boolean isVisiting(final Vertex vertex, final Map vertexStateMap) {
+ final Integer state = vertexStateMap.get(vertex);
- return VISITING.equals( state );
+ return VISITING.equals(state);
}
- private static boolean dfsVisit( final Vertex vertex, final LinkedList cycle,
- final Map vertexStateMap )
- {
- cycle.addFirst( vertex.getLabel() );
+ private static boolean dfsVisit(
+ final Vertex vertex, final LinkedList cycle, final Map vertexStateMap) {
+ cycle.addFirst(vertex.getLabel());
- vertexStateMap.put( vertex, VISITING );
+ vertexStateMap.put(vertex, VISITING);
- for ( Vertex v : vertex.getChildren() )
- {
- if ( isNotVisited( v, vertexStateMap ) )
- {
- final boolean hasCycle = dfsVisit( v, cycle, vertexStateMap );
+ for (Vertex v : vertex.getChildren()) {
+ if (isNotVisited(v, vertexStateMap)) {
+ final boolean hasCycle = dfsVisit(v, cycle, vertexStateMap);
- if ( hasCycle )
- {
+ if (hasCycle) {
return true;
}
- }
- else if ( isVisiting( v, vertexStateMap ) )
- {
- cycle.addFirst( v.getLabel() );
+ } else if (isVisiting(v, vertexStateMap)) {
+ cycle.addFirst(v.getLabel());
return true;
}
}
- vertexStateMap.put( vertex, VISITED );
+ vertexStateMap.put(vertex, VISITED);
cycle.removeFirst();
return false;
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/DAG.java b/src/main/java/org/codehaus/plexus/util/dag/DAG.java
index 4d0f9a45..a652fcd0 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/DAG.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/DAG.java
@@ -30,9 +30,7 @@
*
* TODO this class should be renamed from DAG to Dag
*/
-public class DAG
- implements Cloneable, Serializable
-{
+public class DAG implements Cloneable, Serializable {
// ------------------------------------------------------------
// Fields
// ------------------------------------------------------------
@@ -56,8 +54,7 @@ public class DAG
/**
*
*/
- public DAG()
- {
+ public DAG() {
super();
}
@@ -68,8 +65,7 @@ public DAG()
/**
* @return the vertices
*/
- public List getVertices()
- {
+ public List getVertices() {
return vertexList;
}
@@ -78,13 +74,11 @@ public List getVertices()
* @return the vertices
*/
@Deprecated
- public List getVerticies()
- {
+ public List getVerticies() {
return getVertices();
}
- public Set getLabels()
- {
+ public Set getLabels() {
return vertexMap.keySet();
}
@@ -99,101 +93,86 @@ public Set getLabels()
* @return New vertex if vertex of given label was not present in the DAG or existing vertex if vertex of given
* label was already added to DAG
*/
- public Vertex addVertex( final String label )
- {
+ public Vertex addVertex(final String label) {
Vertex retValue = null;
// check if vertex is already in DAG
- if ( vertexMap.containsKey( label ) )
- {
- retValue = vertexMap.get( label );
- }
- else
- {
- retValue = new Vertex( label );
+ if (vertexMap.containsKey(label)) {
+ retValue = vertexMap.get(label);
+ } else {
+ retValue = new Vertex(label);
- vertexMap.put( label, retValue );
+ vertexMap.put(label, retValue);
- vertexList.add( retValue );
+ vertexList.add(retValue);
}
return retValue;
}
- public void addEdge( final String from, final String to )
- throws CycleDetectedException
- {
- final Vertex v1 = addVertex( from );
+ public void addEdge(final String from, final String to) throws CycleDetectedException {
+ final Vertex v1 = addVertex(from);
- final Vertex v2 = addVertex( to );
+ final Vertex v2 = addVertex(to);
- addEdge( v1, v2 );
+ addEdge(v1, v2);
}
- public void addEdge( final Vertex from, final Vertex to )
- throws CycleDetectedException
- {
+ public void addEdge(final Vertex from, final Vertex to) throws CycleDetectedException {
- from.addEdgeTo( to );
+ from.addEdgeTo(to);
- to.addEdgeFrom( from );
+ to.addEdgeFrom(from);
- final List cycle = CycleDetector.introducesCycle( to );
+ final List cycle = CycleDetector.introducesCycle(to);
- if ( cycle != null )
- {
+ if (cycle != null) {
// remove edge which introduced cycle
- removeEdge( from, to );
+ removeEdge(from, to);
final String msg = "Edge between '" + from + "' and '" + to + "' introduces to cycle in the graph";
- throw new CycleDetectedException( msg, cycle );
+ throw new CycleDetectedException(msg, cycle);
}
}
- public void removeEdge( final String from, final String to )
- {
- final Vertex v1 = addVertex( from );
+ public void removeEdge(final String from, final String to) {
+ final Vertex v1 = addVertex(from);
- final Vertex v2 = addVertex( to );
+ final Vertex v2 = addVertex(to);
- removeEdge( v1, v2 );
+ removeEdge(v1, v2);
}
- public void removeEdge( final Vertex from, final Vertex to )
- {
- from.removeEdgeTo( to );
+ public void removeEdge(final Vertex from, final Vertex to) {
+ from.removeEdgeTo(to);
- to.removeEdgeFrom( from );
+ to.removeEdgeFrom(from);
}
- public Vertex getVertex( final String label )
- {
- final Vertex retValue = vertexMap.get( label );
+ public Vertex getVertex(final String label) {
+ final Vertex retValue = vertexMap.get(label);
return retValue;
}
- public boolean hasEdge( final String label1, final String label2 )
- {
- final Vertex v1 = getVertex( label1 );
+ public boolean hasEdge(final String label1, final String label2) {
+ final Vertex v1 = getVertex(label1);
- final Vertex v2 = getVertex( label2 );
+ final Vertex v2 = getVertex(label2);
- final boolean retValue = v1.getChildren().contains( v2 );
+ final boolean retValue = v1.getChildren().contains(v2);
return retValue;
-
}
/**
* @param label see name
* @return the childs
*/
- public List getChildLabels( final String label )
- {
- final Vertex vertex = getVertex( label );
+ public List getChildLabels(final String label) {
+ final Vertex vertex = getVertex(label);
return vertex.getChildLabels();
}
@@ -202,9 +181,8 @@ public List getChildLabels( final String label )
* @param label see name
* @return the parents
*/
- public List getParentLabels( final String label )
- {
- final Vertex vertex = getVertex( label );
+ public List getParentLabels(final String label) {
+ final Vertex vertex = getVertex(label);
return vertex.getParentLabels();
}
@@ -213,9 +191,7 @@ public List getParentLabels( final String label )
* @see java.lang.Object#clone()
*/
@Override
- public Object clone()
- throws CloneNotSupportedException
- {
+ public Object clone() throws CloneNotSupportedException {
// this is what's failing..
final Object retValue = super.clone();
@@ -227,14 +203,12 @@ public Object clone()
* @param label the label
* @return true if this vertex is connected with other vertex,false otherwise
*/
- public boolean isConnected( final String label )
- {
- final Vertex vertex = getVertex( label );
+ public boolean isConnected(final String label) {
+ final Vertex vertex = getVertex(label);
final boolean retValue = vertex.isConnected();
return retValue;
-
}
/**
@@ -244,25 +218,20 @@ public boolean isConnected( final String label )
* @return The list of labels. Returned list contains also the label passed as parameter to this method. This label
* should always be the last item in the list.
*/
- public List getSuccessorLabels( final String label )
- {
- final Vertex vertex = getVertex( label );
+ public List getSuccessorLabels(final String label) {
+ final Vertex vertex = getVertex(label);
final List retValue;
// optimization.
- if ( vertex.isLeaf() )
- {
- retValue = new ArrayList<>( 1 );
+ if (vertex.isLeaf()) {
+ retValue = new ArrayList<>(1);
- retValue.add( label );
- }
- else
- {
- retValue = TopologicalSorter.sort( vertex );
+ retValue.add(label);
+ } else {
+ retValue = TopologicalSorter.sort(vertex);
}
return retValue;
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
index b2736255..da801335 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/TopologicalSorter.java
@@ -25,74 +25,63 @@
* @author Michal Maczka
*
*/
-public class TopologicalSorter
-{
+public class TopologicalSorter {
- private final static Integer NOT_VISITED = 0;
+ private static final Integer NOT_VISITED = 0;
- private final static Integer VISITING = 1;
+ private static final Integer VISITING = 1;
- private final static Integer VISITED = 2;
+ private static final Integer VISITED = 2;
/**
* @param graph the graph
* @return List of String (vertex labels)
*/
- public static List sort( final DAG graph )
- {
- return dfs( graph );
+ public static List sort(final DAG graph) {
+ return dfs(graph);
}
- public static List sort( final Vertex vertex )
- {
+ public static List sort(final Vertex vertex) {
// we need to use addFirst method so we will use LinkedList explicitly
final List retValue = new LinkedList<>();
- dfsVisit( vertex, new HashMap(), retValue );
+ dfsVisit(vertex, new HashMap(), retValue);
return retValue;
}
- private static List dfs( final DAG graph )
- {
+ private static List dfs(final DAG graph) {
// we need to use addFirst method so we will use LinkedList explicitly
final List retValue = new LinkedList<>();
final Map vertexStateMap = new HashMap<>();
- for ( Vertex vertex : graph.getVertices() )
- {
- if ( isNotVisited( vertex, vertexStateMap ) )
- {
- dfsVisit( vertex, vertexStateMap, retValue );
+ for (Vertex vertex : graph.getVertices()) {
+ if (isNotVisited(vertex, vertexStateMap)) {
+ dfsVisit(vertex, vertexStateMap, retValue);
}
}
return retValue;
}
- private static boolean isNotVisited( final Vertex vertex, final Map vertexStateMap )
- {
- final Integer state = vertexStateMap.get( vertex );
+ private static boolean isNotVisited(final Vertex vertex, final Map vertexStateMap) {
+ final Integer state = vertexStateMap.get(vertex);
- return ( state == null ) || NOT_VISITED.equals( state );
+ return (state == null) || NOT_VISITED.equals(state);
}
- private static void dfsVisit( final Vertex vertex, final Map vertexStateMap,
- final List list )
- {
- vertexStateMap.put( vertex, VISITING );
+ private static void dfsVisit(
+ final Vertex vertex, final Map vertexStateMap, final List list) {
+ vertexStateMap.put(vertex, VISITING);
- for ( Vertex v : vertex.getChildren() )
- {
- if ( isNotVisited( v, vertexStateMap ) )
- {
- dfsVisit( v, vertexStateMap, list );
+ for (Vertex v : vertex.getChildren()) {
+ if (isNotVisited(v, vertexStateMap)) {
+ dfsVisit(v, vertexStateMap, list);
}
}
- vertexStateMap.put( vertex, VISITED );
+ vertexStateMap.put(vertex, VISITED);
- list.add( vertex.getLabel() );
+ list.add(vertex.getLabel());
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/dag/Vertex.java b/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
index 489b6185..bb3cfcc1 100644
--- a/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
+++ b/src/main/java/org/codehaus/plexus/util/dag/Vertex.java
@@ -24,9 +24,7 @@
* @author Michal Maczka
*
*/
-public class Vertex
- implements Cloneable, Serializable
-{
+public class Vertex implements Cloneable, Serializable {
// ------------------------------------------------------------
// Fields
// ------------------------------------------------------------
@@ -40,8 +38,7 @@ public class Vertex
// Constructors
// ------------------------------------------------------------
- public Vertex( final String label )
- {
+ public Vertex(final String label) {
this.label = label;
}
@@ -49,33 +46,27 @@ public Vertex( final String label )
// Accessors
// ------------------------------------------------------------
- public String getLabel()
- {
+ public String getLabel() {
return label;
}
- public void addEdgeTo( final Vertex vertex )
- {
- children.add( vertex );
+ public void addEdgeTo(final Vertex vertex) {
+ children.add(vertex);
}
- public void removeEdgeTo( final Vertex vertex )
- {
- children.remove( vertex );
+ public void removeEdgeTo(final Vertex vertex) {
+ children.remove(vertex);
}
- public void addEdgeFrom( final Vertex vertex )
- {
- parents.add( vertex );
+ public void addEdgeFrom(final Vertex vertex) {
+ parents.add(vertex);
}
- public void removeEdgeFrom( final Vertex vertex )
- {
- parents.remove( vertex );
+ public void removeEdgeFrom(final Vertex vertex) {
+ parents.remove(vertex);
}
- public List getChildren()
- {
+ public List getChildren() {
return children;
}
@@ -84,13 +75,11 @@ public List getChildren()
*
* @return the labels used by the most direct children.
*/
- public List getChildLabels()
- {
- final List retValue = new ArrayList<>( children.size() );
+ public List getChildLabels() {
+ final List retValue = new ArrayList<>(children.size());
- for ( Vertex vertex : children )
- {
- retValue.add( vertex.getLabel() );
+ for (Vertex vertex : children) {
+ retValue.add(vertex.getLabel());
}
return retValue;
}
@@ -100,8 +89,7 @@ public List getChildLabels()
*
* @return list of parents
*/
- public List getParents()
- {
+ public List getParents() {
return parents;
}
@@ -110,13 +98,11 @@ public List getParents()
*
* @return the labels used parents
*/
- public List getParentLabels()
- {
- final List retValue = new ArrayList<>( parents.size() );
+ public List getParentLabels() {
+ final List retValue = new ArrayList<>(parents.size());
- for ( Vertex vertex : parents )
- {
- retValue.add( vertex.getLabel() );
+ for (Vertex vertex : parents) {
+ retValue.add(vertex.getLabel());
}
return retValue;
}
@@ -126,8 +112,7 @@ public List getParentLabels()
*
* @return true if this vertex has no child, false otherwise
*/
- public boolean isLeaf()
- {
+ public boolean isLeaf() {
return children.size() == 0;
}
@@ -136,8 +121,7 @@ public boolean isLeaf()
*
* @return true if this vertex has no parent, false otherwise
*/
- public boolean isRoot()
- {
+ public boolean isRoot() {
return parents.size() == 0;
}
@@ -146,15 +130,12 @@ public boolean isRoot()
*
* @return true if this vertex is connected with other vertex,false otherwise
*/
- public boolean isConnected()
- {
+ public boolean isConnected() {
return isRoot() || isLeaf();
}
@Override
- public Object clone()
- throws CloneNotSupportedException
- {
+ public Object clone() throws CloneNotSupportedException {
// this is what's failing..
final Object retValue = super.clone();
@@ -162,9 +143,7 @@ public Object clone()
}
@Override
- public String toString()
- {
+ public String toString() {
return "Vertex{" + "label='" + label + "'" + "}";
}
-
}
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java b/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
index 6e0c8be2..472419df 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/ClassMap.java
@@ -31,11 +31,8 @@
* @author Geir Magnusson Jr.
*
*/
-public class ClassMap
-{
- private static final class CacheMiss
- {
- }
+public class ClassMap {
+ private static final class CacheMiss {}
private static final CacheMiss CACHE_MISS = new CacheMiss();
@@ -44,7 +41,6 @@ private static final class CacheMiss
/**
* Class passed into the constructor used to as the basis for the Method map.
*/
-
private final Class clazz;
/**
@@ -58,8 +54,7 @@ private static final class CacheMiss
* Standard constructor
* @param clazz the Class
*/
- public ClassMap( Class clazz )
- {
+ public ClassMap(Class clazz) {
this.clazz = clazz;
populateMethodCache();
}
@@ -67,58 +62,47 @@ public ClassMap( Class clazz )
/**
* @return the class object whose methods are cached by this map.
*/
- Class getCachedClass()
- {
+ Class getCachedClass() {
return clazz;
}
/**
* Find a Method using the methodKey provided.
- *
+ *
* Look in the methodMap for an entry. If found, it'll either be a CACHE_MISS, in which case we simply give up, or
* it'll be a Method, in which case, we return it.
- *
+ *
* If nothing is found, then we must actually go and introspect the method from the MethodMap.
* @param name method name
* @param params method params
* @return the find Method or null
* @throws org.codehaus.plexus.util.introspection.MethodMap.AmbiguousException if ambiguous name
*/
- public Method findMethod( String name, Object[] params )
- throws MethodMap.AmbiguousException
- {
- String methodKey = makeMethodKey( name, params );
- Object cacheEntry = methodCache.get( methodKey );
-
- if ( cacheEntry == CACHE_MISS )
- {
+ public Method findMethod(String name, Object[] params) throws MethodMap.AmbiguousException {
+ String methodKey = makeMethodKey(name, params);
+ Object cacheEntry = methodCache.get(methodKey);
+
+ if (cacheEntry == CACHE_MISS) {
return null;
}
- if ( cacheEntry == null )
- {
- try
- {
- cacheEntry = methodMap.find( name, params );
- }
- catch ( MethodMap.AmbiguousException ae )
- {
+ if (cacheEntry == null) {
+ try {
+ cacheEntry = methodMap.find(name, params);
+ } catch (MethodMap.AmbiguousException ae) {
/*
* that's a miss :)
*/
- methodCache.put( methodKey, CACHE_MISS );
+ methodCache.put(methodKey, CACHE_MISS);
throw ae;
}
- if ( cacheEntry == null )
- {
- methodCache.put( methodKey, CACHE_MISS );
- }
- else
- {
- methodCache.put( methodKey, cacheEntry );
+ if (cacheEntry == null) {
+ methodCache.put(methodKey, CACHE_MISS);
+ } else {
+ methodCache.put(methodKey, cacheEntry);
}
}
@@ -130,28 +114,26 @@ public Method findMethod( String name, Object[] params )
/**
* Populate the Map of direct hits. These are taken from all the public methods that our class provides.
*/
- private void populateMethodCache()
- {
+ private void populateMethodCache() {
StringBuffer methodKey;
/*
* get all publicly accessible methods
*/
- Method[] methods = getAccessibleMethods( clazz );
+ Method[] methods = getAccessibleMethods(clazz);
/*
* map and cache them
*/
- for ( Method method : methods )
- {
+ for (Method method : methods) {
/*
* now get the 'public method', the method declared by a public interface or class. (because the actual
* implementing class may be a facade...
*/
- Method publicMethod = getPublicMethod( method );
+ Method publicMethod = getPublicMethod(method);
/*
* it is entirely possible that there is no public method for the methods of this class (i.e. in the facade,
@@ -159,10 +141,9 @@ private void populateMethodCache()
* cache
*/
- if ( publicMethod != null )
- {
- methodMap.add( publicMethod );
- methodCache.put( makeMethodKey( publicMethod ), publicMethod );
+ if (publicMethod != null) {
+ methodMap.add(publicMethod);
+ methodCache.put(makeMethodKey(publicMethod), publicMethod);
}
}
}
@@ -170,76 +151,53 @@ private void populateMethodCache()
/**
* Make a methodKey for the given method using the concatenation of the name and the types of the method parameters.
*/
- private String makeMethodKey( Method method )
- {
+ private String makeMethodKey(Method method) {
Class[] parameterTypes = method.getParameterTypes();
- StringBuilder methodKey = new StringBuilder( method.getName() );
+ StringBuilder methodKey = new StringBuilder(method.getName());
- for ( Class parameterType : parameterTypes )
- {
+ for (Class parameterType : parameterTypes) {
/*
* If the argument type is primitive then we want to convert our primitive type signature to the
* corresponding Object type so introspection for methods with primitive types will work correctly.
*/
- if ( parameterType.isPrimitive() )
- {
- if ( parameterType.equals( Boolean.TYPE ) )
- {
- methodKey.append( "java.lang.Boolean" );
- }
- else if ( parameterType.equals( Byte.TYPE ) )
- {
- methodKey.append( "java.lang.Byte" );
- }
- else if ( parameterType.equals( Character.TYPE ) )
- {
- methodKey.append( "java.lang.Character" );
+ if (parameterType.isPrimitive()) {
+ if (parameterType.equals(Boolean.TYPE)) {
+ methodKey.append("java.lang.Boolean");
+ } else if (parameterType.equals(Byte.TYPE)) {
+ methodKey.append("java.lang.Byte");
+ } else if (parameterType.equals(Character.TYPE)) {
+ methodKey.append("java.lang.Character");
+ } else if (parameterType.equals(Double.TYPE)) {
+ methodKey.append("java.lang.Double");
+ } else if (parameterType.equals(Float.TYPE)) {
+ methodKey.append("java.lang.Float");
+ } else if (parameterType.equals(Integer.TYPE)) {
+ methodKey.append("java.lang.Integer");
+ } else if (parameterType.equals(Long.TYPE)) {
+ methodKey.append("java.lang.Long");
+ } else if (parameterType.equals(Short.TYPE)) {
+ methodKey.append("java.lang.Short");
}
- else if ( parameterType.equals( Double.TYPE ) )
- {
- methodKey.append( "java.lang.Double" );
- }
- else if ( parameterType.equals( Float.TYPE ) )
- {
- methodKey.append( "java.lang.Float" );
- }
- else if ( parameterType.equals( Integer.TYPE ) )
- {
- methodKey.append( "java.lang.Integer" );
- }
- else if ( parameterType.equals( Long.TYPE ) )
- {
- methodKey.append( "java.lang.Long" );
- }
- else if ( parameterType.equals( Short.TYPE ) )
- {
- methodKey.append( "java.lang.Short" );
- }
- }
- else
- {
- methodKey.append( parameterType.getName() );
+ } else {
+ methodKey.append(parameterType.getName());
}
}
return methodKey.toString();
}
- private static String makeMethodKey( String method, Object[] params )
- {
- StringBuilder methodKey = new StringBuilder().append( method );
+ private static String makeMethodKey(String method, Object[] params) {
+ StringBuilder methodKey = new StringBuilder().append(method);
- for ( Object param : params )
- {
+ for (Object param : params) {
Object arg = param;
- if ( arg == null )
- {
+ if (arg == null) {
arg = OBJECT;
}
- methodKey.append( arg.getClass().getName() );
+ methodKey.append(arg.getClass().getName());
}
return methodKey.toString();
@@ -250,16 +208,14 @@ private static String makeMethodKey( String method, Object[] params )
* its public methods from public superclasses and interfaces (if they exist). Basically upcasts every method to the
* nearest accessible method.
*/
- private static Method[] getAccessibleMethods( Class clazz )
- {
+ private static Method[] getAccessibleMethods(Class clazz) {
Method[] methods = clazz.getMethods();
/*
* Short circuit for the (hopefully) majority of cases where the clazz is public
*/
- if ( Modifier.isPublic( clazz.getModifiers() ) )
- {
+ if (Modifier.isPublic(clazz.getModifiers())) {
return methods;
}
@@ -269,27 +225,23 @@ private static Method[] getAccessibleMethods( Class clazz )
MethodInfo[] methodInfos = new MethodInfo[methods.length];
- for ( int i = methods.length; i-- > 0; )
- {
- methodInfos[i] = new MethodInfo( methods[i] );
+ for (int i = methods.length; i-- > 0; ) {
+ methodInfos[i] = new MethodInfo(methods[i]);
}
- int upcastCount = getAccessibleMethods( clazz, methodInfos, 0 );
+ int upcastCount = getAccessibleMethods(clazz, methodInfos, 0);
/*
* Reallocate array in case some method had no accessible counterpart.
*/
- if ( upcastCount < methods.length )
- {
+ if (upcastCount < methods.length) {
methods = new Method[upcastCount];
}
int j = 0;
- for ( MethodInfo methodInfo : methodInfos )
- {
- if ( methodInfo.upcast )
- {
+ for (MethodInfo methodInfo : methodInfos) {
+ if (methodInfo.upcast) {
methods[j++] = methodInfo.method;
}
}
@@ -305,30 +257,23 @@ private static Method[] getAccessibleMethods( Class clazz )
* @param upcastCount current number of methods we have matched
* @return count of matched methods
*/
- private static int getAccessibleMethods( Class clazz, MethodInfo[] methodInfos, int upcastCount )
- {
+ private static int getAccessibleMethods(Class clazz, MethodInfo[] methodInfos, int upcastCount) {
int l = methodInfos.length;
/*
* if this class is public, then check each of the currently 'non-upcasted' methods to see if we have a match
*/
- if ( Modifier.isPublic( clazz.getModifiers() ) )
- {
- for ( int i = 0; i < l && upcastCount < l; ++i )
- {
- try
- {
+ if (Modifier.isPublic(clazz.getModifiers())) {
+ for (int i = 0; i < l && upcastCount < l; ++i) {
+ try {
MethodInfo methodInfo = methodInfos[i];
- if ( !methodInfo.upcast )
- {
- methodInfo.tryUpcasting( clazz );
+ if (!methodInfo.upcast) {
+ methodInfo.tryUpcasting(clazz);
upcastCount++;
}
- }
- catch ( NoSuchMethodException e )
- {
+ } catch (NoSuchMethodException e) {
/*
* Intentionally ignored - it means it wasn't found in the current class
*/
@@ -339,8 +284,7 @@ private static int getAccessibleMethods( Class clazz, MethodInfo[] methodInfos,
* Short circuit if all methods were upcast
*/
- if ( upcastCount == l )
- {
+ if (upcastCount == l) {
return upcastCount;
}
}
@@ -351,16 +295,14 @@ private static int getAccessibleMethods( Class clazz, MethodInfo[] methodInfos,
Class superclazz = clazz.getSuperclass();
- if ( superclazz != null )
- {
- upcastCount = getAccessibleMethods( superclazz, methodInfos, upcastCount );
+ if (superclazz != null) {
+ upcastCount = getAccessibleMethods(superclazz, methodInfos, upcastCount);
/*
* Short circuit if all methods were upcast
*/
- if ( upcastCount == l )
- {
+ if (upcastCount == l) {
return upcastCount;
}
}
@@ -372,16 +314,14 @@ private static int getAccessibleMethods( Class clazz, MethodInfo[] methodInfos,
Class[] interfaces = clazz.getInterfaces();
- for ( int i = interfaces.length; i-- > 0; )
- {
- upcastCount = getAccessibleMethods( interfaces[i], methodInfos, upcastCount );
+ for (int i = interfaces.length; i-- > 0; ) {
+ upcastCount = getAccessibleMethods(interfaces[i], methodInfos, upcastCount);
/*
* Short circuit if all methods were upcast
*/
- if ( upcastCount == l )
- {
+ if (upcastCount == l) {
return upcastCount;
}
}
@@ -398,20 +338,18 @@ private static int getAccessibleMethods( Class clazz, MethodInfo[] methodInfos,
* @return the publicly callable counterpart method. Note that if the parameter method is itself declared by a
* public class, this method is an identity function.
*/
- public static Method getPublicMethod( Method method )
- {
+ public static Method getPublicMethod(Method method) {
Class clazz = method.getDeclaringClass();
/*
* Short circuit for (hopefully the majority of) cases where the declaring class is public.
*/
- if ( ( clazz.getModifiers() & Modifier.PUBLIC ) != 0 )
- {
+ if ((clazz.getModifiers() & Modifier.PUBLIC) != 0) {
return method;
}
- return getPublicMethod( clazz, method.getName(), method.getParameterTypes() );
+ return getPublicMethod(clazz, method.getName(), method.getParameterTypes());
}
/**
@@ -422,20 +360,15 @@ public static Method getPublicMethod( Method method )
* @param name the name of the method
* @param paramTypes the classes of method parameters
*/
- private static Method getPublicMethod( Class clazz, String name, Class[] paramTypes )
- {
+ private static Method getPublicMethod(Class clazz, String name, Class[] paramTypes) {
/*
* if this class is public, then try to get it
*/
- if ( ( clazz.getModifiers() & Modifier.PUBLIC ) != 0 )
- {
- try
- {
- return clazz.getMethod( name, paramTypes );
- }
- catch ( NoSuchMethodException e )
- {
+ if ((clazz.getModifiers() & Modifier.PUBLIC) != 0) {
+ try {
+ return clazz.getMethod(name, paramTypes);
+ } catch (NoSuchMethodException e) {
/*
* If the class does not have the method, then neither its superclass nor any of its interfaces has it
* so quickly return null.
@@ -450,12 +383,10 @@ private static Method getPublicMethod( Class clazz, String name, Class[] paramTy
Class superclazz = clazz.getSuperclass();
- if ( superclazz != null )
- {
- Method superclazzMethod = getPublicMethod( superclazz, name, paramTypes );
+ if (superclazz != null) {
+ Method superclazzMethod = getPublicMethod(superclazz, name, paramTypes);
- if ( superclazzMethod != null )
- {
+ if (superclazzMethod != null) {
return superclazzMethod;
}
}
@@ -466,12 +397,10 @@ private static Method getPublicMethod( Class clazz, String name, Class[] paramTy
Class[] interfaces = clazz.getInterfaces();
- for ( Class anInterface : interfaces )
- {
- Method interfaceMethod = getPublicMethod( anInterface, name, paramTypes );
+ for (Class anInterface : interfaces) {
+ Method interfaceMethod = getPublicMethod(anInterface, name, paramTypes);
- if ( interfaceMethod != null )
- {
+ if (interfaceMethod != null) {
return interfaceMethod;
}
}
@@ -482,8 +411,7 @@ private static Method getPublicMethod( Class clazz, String name, Class[] paramTy
/**
* Used for the iterative discovery process for public methods.
*/
- private static final class MethodInfo
- {
+ private static final class MethodInfo {
Method method;
String name;
@@ -492,18 +420,15 @@ private static final class MethodInfo
boolean upcast;
- MethodInfo( Method method )
- {
+ MethodInfo(Method method) {
this.method = null;
name = method.getName();
parameterTypes = method.getParameterTypes();
upcast = false;
}
- void tryUpcasting( Class clazz )
- throws NoSuchMethodException
- {
- method = clazz.getMethod( name, parameterTypes );
+ void tryUpcasting(Class clazz) throws NoSuchMethodException {
+ method = clazz.getMethod(name, parameterTypes);
name = null;
parameterTypes = null;
upcast = true;
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java b/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
index 51420cca..52493ce0 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/MethodMap.java
@@ -32,8 +32,7 @@
* @author Attila Szegedi
*
*/
-public class MethodMap
-{
+public class MethodMap {
private static final int MORE_SPECIFIC = 0;
private static final int LESS_SPECIFIC = 1;
@@ -48,22 +47,20 @@ public class MethodMap
/**
* Add a method to a list of methods by name. For a particular class we are keeping track of all the methods with
* the same name.
- *
+ *
* @param method The method
*/
- public void add( Method method )
- {
+ public void add(Method method) {
String methodName = method.getName();
- List l = get( methodName );
+ List l = get(methodName);
- if ( l == null )
- {
+ if (l == null) {
l = new ArrayList();
- methodByNameMap.put( methodName, l );
+ methodByNameMap.put(methodName, l);
}
- l.add( method );
+ l.add(method);
}
/**
@@ -72,9 +69,8 @@ public void add( Method method )
* @param key The name of the method.
* @return List list of methods
*/
- public List get( String key )
- {
- return methodByNameMap.get( key );
+ public List get(String key) {
+ return methodByNameMap.get(key);
}
/**
@@ -94,21 +90,17 @@ public List get( String key )
* @return the most specific applicable method, or null if no method is applicable.
* @throws AmbiguousException if there is more than one maximally specific applicable method
*/
- public Method find( String methodName, Object[] args )
- throws AmbiguousException
- {
- List methodList = get( methodName );
+ public Method find(String methodName, Object[] args) throws AmbiguousException {
+ List methodList = get(methodName);
- if ( methodList == null )
- {
+ if (methodList == null) {
return null;
}
int l = args.length;
Class[] classes = new Class[l];
- for ( int i = 0; i < l; ++i )
- {
+ for (int i = 0; i < l; ++i) {
Object arg = args[i];
/*
@@ -118,29 +110,22 @@ public Method find( String methodName, Object[] args )
classes[i] = arg == null ? null : arg.getClass();
}
- return getMostSpecific( methodList, classes );
+ return getMostSpecific(methodList, classes);
}
/**
* simple distinguishable exception, used when we run across ambiguous overloading
*/
- public static class AmbiguousException
- extends Exception
- {
- }
+ public static class AmbiguousException extends Exception {}
- private static Method getMostSpecific( List methods, Class[] classes )
- throws AmbiguousException
- {
- LinkedList applicables = getApplicables( methods, classes );
+ private static Method getMostSpecific(List methods, Class[] classes) throws AmbiguousException {
+ LinkedList applicables = getApplicables(methods, classes);
- if ( applicables.isEmpty() )
- {
+ if (applicables.isEmpty()) {
return null;
}
- if ( applicables.size() == 1 )
- {
+ if (applicables.size() == 1) {
return applicables.getFirst();
}
@@ -151,19 +136,15 @@ private static Method getMostSpecific( List methods, Class[] classes )
LinkedList maximals = new LinkedList();
- for ( Method app : applicables )
- {
+ for (Method app : applicables) {
Class[] appArgs = app.getParameterTypes();
boolean lessSpecific = false;
- for ( Iterator maximal = maximals.iterator(); !lessSpecific && maximal.hasNext(); )
- {
+ for (Iterator maximal = maximals.iterator(); !lessSpecific && maximal.hasNext(); ) {
Method max = maximal.next();
- switch ( moreSpecific( appArgs, max.getParameterTypes() ) )
- {
- case MORE_SPECIFIC:
- {
+ switch (moreSpecific(appArgs, max.getParameterTypes())) {
+ case MORE_SPECIFIC: {
/*
* This method is more specific than the previously known maximally specific, so remove the old
* maximum.
@@ -173,8 +154,7 @@ private static Method getMostSpecific( List methods, Class[] classes )
break;
}
- case LESS_SPECIFIC:
- {
+ case LESS_SPECIFIC: {
/*
* This method is less specific than some of the currently known maximally specific methods, so
* we won't add it into the set of maximally specific methods
@@ -186,14 +166,12 @@ private static Method getMostSpecific( List methods, Class[] classes )
}
}
- if ( !lessSpecific )
- {
- maximals.addLast( app );
+ if (!lessSpecific) {
+ maximals.addLast(app);
}
}
- if ( maximals.size() > 1 )
- {
+ if (maximals.size() > 1) {
// We have more than one maximally specific method
throw new AmbiguousException();
}
@@ -204,30 +182,25 @@ private static Method getMostSpecific( List methods, Class[] classes )
/**
* Determines which method signature (represented by a class array) is more specific. This defines a partial
* ordering on the method signatures.
- *
+ *
* @param c1 first signature to compare
* @param c2 second signature to compare
* @return MORE_SPECIFIC if c1 is more specific than c2, LESS_SPECIFIC if c1 is less specific than c2, INCOMPARABLE
* if they are incomparable.
*/
- private static int moreSpecific( Class[] c1, Class[] c2 )
- {
+ private static int moreSpecific(Class[] c1, Class[] c2) {
boolean c1MoreSpecific = false;
boolean c2MoreSpecific = false;
- for ( int i = 0; i < c1.length; ++i )
- {
- if ( c1[i] != c2[i] )
- {
- c1MoreSpecific = c1MoreSpecific || isStrictMethodInvocationConvertible( c2[i], c1[i] );
- c2MoreSpecific = c2MoreSpecific || isStrictMethodInvocationConvertible( c1[i], c2[i] );
+ for (int i = 0; i < c1.length; ++i) {
+ if (c1[i] != c2[i]) {
+ c1MoreSpecific = c1MoreSpecific || isStrictMethodInvocationConvertible(c2[i], c1[i]);
+ c2MoreSpecific = c2MoreSpecific || isStrictMethodInvocationConvertible(c1[i], c2[i]);
}
}
- if ( c1MoreSpecific )
- {
- if ( c2MoreSpecific )
- {
+ if (c1MoreSpecific) {
+ if (c2MoreSpecific) {
/*
* Incomparable due to cross-assignable arguments (i.e. foo(String, Object) vs. foo(Object, String))
*/
@@ -238,8 +211,7 @@ private static int moreSpecific( Class[] c1, Class[] c2 )
return MORE_SPECIFIC;
}
- if ( c2MoreSpecific )
- {
+ if (c2MoreSpecific) {
return LESS_SPECIFIC;
}
@@ -252,49 +224,41 @@ private static int moreSpecific( Class[] c1, Class[] c2 )
/**
* Returns all methods that are applicable to actual argument types.
- *
+ *
* @param methods list of all candidate methods
* @param classes the actual types of the arguments
* @return a list that contains only applicable methods (number of formal and actual arguments matches, and argument
* types are assignable to formal types through a method invocation conversion).
*/
- private static LinkedList getApplicables( List methods, Class[] classes )
- {
+ private static LinkedList getApplicables(List methods, Class[] classes) {
LinkedList list = new LinkedList();
- for ( Object method1 : methods )
- {
+ for (Object method1 : methods) {
Method method = (Method) method1;
- if ( isApplicable( method, classes ) )
- {
- list.add( method );
+ if (isApplicable(method, classes)) {
+ list.add(method);
}
-
}
return list;
}
/**
* Returns true if the supplied method is applicable to actual argument types.
- *
+ *
* @param method The method to check for applicability
* @param classes The arguments
* @return true if the method applies to the parameter types
*/
- private static boolean isApplicable( Method method, Class[] classes )
- {
+ private static boolean isApplicable(Method method, Class[] classes) {
Class[] methodArgs = method.getParameterTypes();
- if ( methodArgs.length != classes.length )
- {
+ if (methodArgs.length != classes.length) {
return false;
}
- for ( int i = 0; i < classes.length; ++i )
- {
- if ( !isMethodInvocationConvertible( methodArgs[i], classes[i] ) )
- {
+ for (int i = 0; i < classes.length; ++i) {
+ if (!isMethodInvocationConvertible(methodArgs[i], classes[i])) {
return false;
}
}
@@ -315,13 +279,11 @@ private static boolean isApplicable( Method method, Class[] classes )
* its corresponding object type or an object type of a primitive type that can be converted to the formal
* type.
*/
- private static boolean isMethodInvocationConvertible( Class formal, Class actual )
- {
+ private static boolean isMethodInvocationConvertible(Class formal, Class actual) {
/*
* if it's a null, it means the arg was null
*/
- if ( actual == null && !formal.isPrimitive() )
- {
+ if (actual == null && !formal.isPrimitive()) {
return true;
}
@@ -329,8 +291,7 @@ private static boolean isMethodInvocationConvertible( Class formal, Class actual
* Check for identity or widening reference conversion
*/
- if ( actual != null && formal.isAssignableFrom( actual ) )
- {
+ if (actual != null && formal.isAssignableFrom(actual)) {
return true;
}
@@ -338,28 +299,31 @@ private static boolean isMethodInvocationConvertible( Class formal, Class actual
* Check for boxing with widening primitive conversion. Note that actual parameters are never primitives.
*/
- if ( formal.isPrimitive() )
- {
- if ( formal == Boolean.TYPE && actual == Boolean.class )
- return true;
- if ( formal == Character.TYPE && actual == Character.class )
- return true;
- if ( formal == Byte.TYPE && actual == Byte.class )
- return true;
- if ( formal == Short.TYPE && ( actual == Short.class || actual == Byte.class ) )
- return true;
- if ( formal == Integer.TYPE
- && ( actual == Integer.class || actual == Short.class || actual == Byte.class ) )
- return true;
- if ( formal == Long.TYPE && ( actual == Long.class || actual == Integer.class || actual == Short.class
- || actual == Byte.class ) )
- return true;
- if ( formal == Float.TYPE && ( actual == Float.class || actual == Long.class || actual == Integer.class
- || actual == Short.class || actual == Byte.class ) )
- return true;
- if ( formal == Double.TYPE && ( actual == Double.class || actual == Float.class || actual == Long.class
- || actual == Integer.class || actual == Short.class || actual == Byte.class ) )
+ if (formal.isPrimitive()) {
+ if (formal == Boolean.TYPE && actual == Boolean.class) return true;
+ if (formal == Character.TYPE && actual == Character.class) return true;
+ if (formal == Byte.TYPE && actual == Byte.class) return true;
+ if (formal == Short.TYPE && (actual == Short.class || actual == Byte.class)) return true;
+ if (formal == Integer.TYPE && (actual == Integer.class || actual == Short.class || actual == Byte.class))
return true;
+ if (formal == Long.TYPE
+ && (actual == Long.class
+ || actual == Integer.class
+ || actual == Short.class
+ || actual == Byte.class)) return true;
+ if (formal == Float.TYPE
+ && (actual == Float.class
+ || actual == Long.class
+ || actual == Integer.class
+ || actual == Short.class
+ || actual == Byte.class)) return true;
+ if (formal == Double.TYPE
+ && (actual == Double.class
+ || actual == Float.class
+ || actual == Long.class
+ || actual == Integer.class
+ || actual == Short.class
+ || actual == Byte.class)) return true;
}
return false;
@@ -375,13 +339,11 @@ private static boolean isMethodInvocationConvertible( Class formal, Class actual
* @return true if either formal type is assignable from actual type, or formal and actual are both primitive types
* and actual can be subject to widening conversion to formal.
*/
- private static boolean isStrictMethodInvocationConvertible( Class formal, Class actual )
- {
+ private static boolean isStrictMethodInvocationConvertible(Class formal, Class actual) {
/*
* we shouldn't get a null into, but if so
*/
- if ( actual == null && !formal.isPrimitive() )
- {
+ if (actual == null && !formal.isPrimitive()) {
return true;
}
@@ -389,8 +351,7 @@ private static boolean isStrictMethodInvocationConvertible( Class formal, Class
* Check for identity or widening reference conversion
*/
- if ( formal.isAssignableFrom( actual ) )
- {
+ if (formal.isAssignableFrom(actual)) {
return true;
}
@@ -398,20 +359,20 @@ private static boolean isStrictMethodInvocationConvertible( Class formal, Class
* Check for widening primitive conversion.
*/
- if ( formal.isPrimitive() )
- {
- if ( formal == Short.TYPE && ( actual == Byte.TYPE ) )
- return true;
- if ( formal == Integer.TYPE && ( actual == Short.TYPE || actual == Byte.TYPE ) )
- return true;
- if ( formal == Long.TYPE && ( actual == Integer.TYPE || actual == Short.TYPE || actual == Byte.TYPE ) )
- return true;
- if ( formal == Float.TYPE
- && ( actual == Long.TYPE || actual == Integer.TYPE || actual == Short.TYPE || actual == Byte.TYPE ) )
+ if (formal.isPrimitive()) {
+ if (formal == Short.TYPE && (actual == Byte.TYPE)) return true;
+ if (formal == Integer.TYPE && (actual == Short.TYPE || actual == Byte.TYPE)) return true;
+ if (formal == Long.TYPE && (actual == Integer.TYPE || actual == Short.TYPE || actual == Byte.TYPE))
return true;
- if ( formal == Double.TYPE && ( actual == Float.TYPE || actual == Long.TYPE || actual == Integer.TYPE
- || actual == Short.TYPE || actual == Byte.TYPE ) )
+ if (formal == Float.TYPE
+ && (actual == Long.TYPE || actual == Integer.TYPE || actual == Short.TYPE || actual == Byte.TYPE))
return true;
+ if (formal == Double.TYPE
+ && (actual == Float.TYPE
+ || actual == Long.TYPE
+ || actual == Integer.TYPE
+ || actual == Short.TYPE
+ || actual == Byte.TYPE)) return true;
}
return false;
}
diff --git a/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java b/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
index 656c8201..0ca46b7f 100644
--- a/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
+++ b/src/main/java/org/codehaus/plexus/util/introspection/ReflectionValueExtractor.java
@@ -34,15 +34,14 @@
*
* The implementation supports indexed, nested and mapped properties similar to the JSP way.
*
- *
+ *
* @author Jason van Zyl
* @author Vincent Siveton
*
* @see http://struts.apache.org/1.x/struts-taglib/indexedprops.html
*/
-public class ReflectionValueExtractor
-{
+public class ReflectionValueExtractor {
private static final Class[] CLASS_ARGS = new Class[0];
private static final Object[] OBJECT_ARGS = new Object[0];
@@ -52,7 +51,7 @@ public class ReflectionValueExtractor
* space overflows due to retention of discarded classloaders.
*/
private static final Map, WeakReference> classMaps =
- new WeakHashMap, WeakReference>();
+ new WeakHashMap, WeakReference>();
static final int EOF = -1;
@@ -66,83 +65,69 @@ public class ReflectionValueExtractor
static final char MAPPED_END = ')';
- static class Tokenizer
- {
+ static class Tokenizer {
final String expression;
int idx;
- public Tokenizer( String expression )
- {
+ public Tokenizer(String expression) {
this.expression = expression;
}
- public int peekChar()
- {
- return idx < expression.length() ? expression.charAt( idx ) : EOF;
+ public int peekChar() {
+ return idx < expression.length() ? expression.charAt(idx) : EOF;
}
- public int skipChar()
- {
- return idx < expression.length() ? expression.charAt( idx++ ) : EOF;
+ public int skipChar() {
+ return idx < expression.length() ? expression.charAt(idx++) : EOF;
}
- public String nextToken( char delimiter )
- {
+ public String nextToken(char delimiter) {
int start = idx;
- while ( idx < expression.length() && delimiter != expression.charAt( idx ) )
- {
+ while (idx < expression.length() && delimiter != expression.charAt(idx)) {
idx++;
}
// delimiter MUST be present
- if ( idx <= start || idx >= expression.length() )
- {
+ if (idx <= start || idx >= expression.length()) {
return null;
}
- return expression.substring( start, idx++ );
+ return expression.substring(start, idx++);
}
- public String nextPropertyName()
- {
+ public String nextPropertyName() {
final int start = idx;
- while ( idx < expression.length() && Character.isJavaIdentifierPart( expression.charAt( idx ) ) )
- {
+ while (idx < expression.length() && Character.isJavaIdentifierPart(expression.charAt(idx))) {
idx++;
}
// property name does not require delimiter
- if ( idx <= start || idx > expression.length() )
- {
+ if (idx <= start || idx > expression.length()) {
return null;
}
- return expression.substring( start, idx );
+ return expression.substring(start, idx);
}
- public int getPosition()
- {
+ public int getPosition() {
return idx < expression.length() ? idx : EOF;
}
// to make tokenizer look pretty in debugger
@Override
- public String toString()
- {
- return idx < expression.length() ? expression.substring( idx ) : "";
+ public String toString() {
+ return idx < expression.length() ? expression.substring(idx) : "";
}
}
- private ReflectionValueExtractor()
- {
- }
+ private ReflectionValueExtractor() {}
/**
* The implementation supports indexed, nested and mapped properties.
- *
+ *
*
* - nested properties should be defined by a dot, i.e. "user.address.street"
* - indexed properties (java.util.List or array instance) should be contains
(\\w+)\\[(\\d+)\\]
@@ -150,21 +135,19 @@ private ReflectionValueExtractor()
* - mapped properties should be contains
(\\w+)\\((.+)\\) pattern, i.e.
* "user.addresses(myAddress).street"
*
- *
+ *
* @param expression not null expression
* @param root not null object
* @return the object defined by the expression
* @throws Exception if any
*/
- public static Object evaluate( String expression, Object root )
- throws Exception
- {
- return evaluate( expression, root, true );
+ public static Object evaluate(String expression, Object root) throws Exception {
+ return evaluate(expression, root, true);
}
/**
* The implementation supports indexed, nested and mapped properties.
- *
+ *
*
* - nested properties should be defined by a dot, i.e. "user.address.street"
* - indexed properties (java.util.List or array instance) should be contains
(\\w+)\\[(\\d+)\\]
@@ -172,7 +155,7 @@ public static Object evaluate( String expression, Object root )
* - mapped properties should be contains
(\\w+)\\((.+)\\) pattern, i.e.
* "user.addresses(myAddress).street"
*
- *
+ *
* @param expression not null expression
* @param root not null object
* @param trimRootToken root start
@@ -180,9 +163,7 @@ public static Object evaluate( String expression, Object root )
* @throws Exception if any
*/
// TODO: don't throw Exception
- public static Object evaluate( String expression, final Object root, final boolean trimRootToken )
- throws Exception
- {
+ public static Object evaluate(String expression, final Object root, final boolean trimRootToken) throws Exception {
Object value = root;
// ----------------------------------------------------------------------
@@ -190,44 +171,45 @@ public static Object evaluate( String expression, final Object root, final boole
// MavenProject instance.
// ----------------------------------------------------------------------
- if ( StringUtils.isEmpty( expression ) || !Character.isJavaIdentifierStart( expression.charAt( 0 ) ) )
- {
+ if (StringUtils.isEmpty(expression) || !Character.isJavaIdentifierStart(expression.charAt(0))) {
return null;
}
- boolean hasDots = expression.indexOf( PROPERTY_START ) >= 0;
+ boolean hasDots = expression.indexOf(PROPERTY_START) >= 0;
final Tokenizer tokenizer;
- if ( trimRootToken && hasDots )
- {
- tokenizer = new Tokenizer( expression );
+ if (trimRootToken && hasDots) {
+ tokenizer = new Tokenizer(expression);
tokenizer.nextPropertyName();
- if ( tokenizer.getPosition() == EOF )
- {
+ if (tokenizer.getPosition() == EOF) {
return null;
}
- }
- else
- {
- tokenizer = new Tokenizer( "." + expression );
+ } else {
+ tokenizer = new Tokenizer("." + expression);
}
int propertyPosition = tokenizer.getPosition();
- while ( value != null && tokenizer.peekChar() != EOF )
- {
- switch ( tokenizer.skipChar() )
- {
+ while (value != null && tokenizer.peekChar() != EOF) {
+ switch (tokenizer.skipChar()) {
case INDEXED_START:
- value = getIndexedValue( expression, propertyPosition, tokenizer.getPosition(), value,
- tokenizer.nextToken( INDEXED_END ) );
+ value = getIndexedValue(
+ expression,
+ propertyPosition,
+ tokenizer.getPosition(),
+ value,
+ tokenizer.nextToken(INDEXED_END));
break;
case MAPPED_START:
- value = getMappedValue( expression, propertyPosition, tokenizer.getPosition(), value,
- tokenizer.nextToken( MAPPED_END ) );
+ value = getMappedValue(
+ expression,
+ propertyPosition,
+ tokenizer.getPosition(),
+ value,
+ tokenizer.nextToken(MAPPED_END));
break;
case PROPERTY_START:
propertyPosition = tokenizer.getPosition();
- value = getPropertyValue( value, tokenizer.nextPropertyName() );
+ value = getPropertyValue(value, tokenizer.nextPropertyName());
break;
default:
// could not parse expression
@@ -238,122 +220,100 @@ public static Object evaluate( String expression, final Object root, final boole
return value;
}
- private static Object getMappedValue( final String expression, final int from, final int to, final Object value,
- final String key )
- throws Exception
- {
- if ( value == null || key == null )
- {
+ private static Object getMappedValue(
+ final String expression, final int from, final int to, final Object value, final String key)
+ throws Exception {
+ if (value == null || key == null) {
return null;
}
- if ( value instanceof Map )
- {
- Object[] localParams = new Object[] { key };
- ClassMap classMap = getClassMap( value.getClass() );
- Method method = classMap.findMethod( "get", localParams );
- return method.invoke( value, localParams );
+ if (value instanceof Map) {
+ Object[] localParams = new Object[] {key};
+ ClassMap classMap = getClassMap(value.getClass());
+ Method method = classMap.findMethod("get", localParams);
+ return method.invoke(value, localParams);
}
- final String message =
- String.format( "The token '%s' at position '%d' refers to a java.util.Map, but the value seems is an instance of '%s'",
- expression.subSequence( from, to ), from, value.getClass() );
+ final String message = String.format(
+ "The token '%s' at position '%d' refers to a java.util.Map, but the value seems is an instance of '%s'",
+ expression.subSequence(from, to), from, value.getClass());
- throw new Exception( message );
+ throw new Exception(message);
}
- private static Object getIndexedValue( final String expression, final int from, final int to, final Object value,
- final String indexStr )
- throws Exception
- {
- try
- {
- int index = Integer.parseInt( indexStr );
-
- if ( value.getClass().isArray() )
- {
- return Array.get( value, index );
+ private static Object getIndexedValue(
+ final String expression, final int from, final int to, final Object value, final String indexStr)
+ throws Exception {
+ try {
+ int index = Integer.parseInt(indexStr);
+
+ if (value.getClass().isArray()) {
+ return Array.get(value, index);
}
- if ( value instanceof List )
- {
- ClassMap classMap = getClassMap( value.getClass() );
+ if (value instanceof List) {
+ ClassMap classMap = getClassMap(value.getClass());
// use get method on List interface
- Object[] localParams = new Object[] { index };
- Method method = classMap.findMethod( "get", localParams );
- return method.invoke( value, localParams );
+ Object[] localParams = new Object[] {index};
+ Method method = classMap.findMethod("get", localParams);
+ return method.invoke(value, localParams);
}
- }
- catch ( NumberFormatException e )
- {
+ } catch (NumberFormatException e) {
return null;
- }
- catch ( InvocationTargetException e )
- {
+ } catch (InvocationTargetException e) {
// catch array index issues gracefully, otherwise release
- if ( e.getCause() instanceof IndexOutOfBoundsException )
- {
+ if (e.getCause() instanceof IndexOutOfBoundsException) {
return null;
}
throw e;
}
- final String message =
- String.format( "The token '%s' at position '%d' refers to a java.util.List or an array, but the value seems is an instance of '%s'",
- expression.subSequence( from, to ), from, value.getClass() );
+ final String message = String.format(
+ "The token '%s' at position '%d' refers to a java.util.List or an array, but the value seems is an instance of '%s'",
+ expression.subSequence(from, to), from, value.getClass());
- throw new Exception( message );
+ throw new Exception(message);
}
- private static Object getPropertyValue( Object value, String property )
- throws Exception
- {
- if ( value == null || property == null )
- {
+ private static Object getPropertyValue(Object value, String property) throws Exception {
+ if (value == null || property == null) {
return null;
}
- ClassMap classMap = getClassMap( value.getClass() );
- String methodBase = StringUtils.capitalizeFirstLetter( property );
+ ClassMap classMap = getClassMap(value.getClass());
+ String methodBase = StringUtils.capitalizeFirstLetter(property);
String methodName = "get" + methodBase;
- Method method = classMap.findMethod( methodName, CLASS_ARGS );
+ Method method = classMap.findMethod(methodName, CLASS_ARGS);
- if ( method == null )
- {
+ if (method == null) {
// perhaps this is a boolean property??
methodName = "is" + methodBase;
- method = classMap.findMethod( methodName, CLASS_ARGS );
+ method = classMap.findMethod(methodName, CLASS_ARGS);
}
- if ( method == null )
- {
+ if (method == null) {
return null;
}
- try
- {
- return method.invoke( value, OBJECT_ARGS );
- }
- catch ( InvocationTargetException e )
- {
+ try {
+ return method.invoke(value, OBJECT_ARGS);
+ } catch (InvocationTargetException e) {
throw e;
}
}
- private static ClassMap getClassMap( Class clazz )
- {
+ private static ClassMap getClassMap(Class clazz) {
- WeakReference softRef = classMaps.get( clazz );
+ WeakReference softRef = classMaps.get(clazz);
ClassMap classMap;
- if ( softRef == null || ( classMap = softRef.get() ) == null )
- {
- classMap = new ClassMap( clazz );
+ if (softRef == null || (classMap = softRef.get()) == null) {
+ classMap = new ClassMap(clazz);
- classMaps.put( clazz, new WeakReference( classMap ) );
+ classMaps.put(clazz, new WeakReference(classMap));
}
return classMap;
diff --git a/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java b/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java
index 744e6f06..4023b053 100644
--- a/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java
+++ b/src/main/java/org/codehaus/plexus/util/io/CachingOutputStream.java
@@ -22,152 +22,124 @@
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
-import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
-import java.nio.file.attribute.FileTime;
-import java.time.Instant;
import java.util.Objects;
/**
* Caching OutputStream to avoid overwriting a file with
* the same content.
*/
-public class CachingOutputStream extends OutputStream
-{
+public class CachingOutputStream extends OutputStream {
private final Path path;
private FileChannel channel;
private ByteBuffer readBuffer;
private ByteBuffer writeBuffer;
private boolean modified;
- public CachingOutputStream( File path ) throws IOException
- {
- this( Objects.requireNonNull( path ).toPath() );
+ public CachingOutputStream(File path) throws IOException {
+ this(Objects.requireNonNull(path).toPath());
}
- public CachingOutputStream( Path path ) throws IOException
- {
- this( path, 32 * 1024 );
+ public CachingOutputStream(Path path) throws IOException {
+ this(path, 32 * 1024);
}
- public CachingOutputStream( Path path, int bufferSize ) throws IOException
- {
- this.path = Objects.requireNonNull( path );
- this.channel = FileChannel.open( path,
- StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE );
- this.readBuffer = ByteBuffer.allocate( bufferSize );
- this.writeBuffer = ByteBuffer.allocate( bufferSize );
+ public CachingOutputStream(Path path, int bufferSize) throws IOException {
+ this.path = Objects.requireNonNull(path);
+ this.channel =
+ FileChannel.open(path, StandardOpenOption.READ, StandardOpenOption.WRITE, StandardOpenOption.CREATE);
+ this.readBuffer = ByteBuffer.allocate(bufferSize);
+ this.writeBuffer = ByteBuffer.allocate(bufferSize);
}
@Override
- public void write( int b ) throws IOException
- {
- if ( writeBuffer.remaining() < 1 )
- {
- ( ( Buffer ) writeBuffer ).flip();
- flushBuffer( writeBuffer );
- ( ( Buffer ) writeBuffer ).clear();
+ public void write(int b) throws IOException {
+ if (writeBuffer.remaining() < 1) {
+ ((Buffer) writeBuffer).flip();
+ flushBuffer(writeBuffer);
+ ((Buffer) writeBuffer).clear();
}
- writeBuffer.put( ( byte ) b );
+ writeBuffer.put((byte) b);
}
@Override
- public void write( byte[] b ) throws IOException
- {
- write( b, 0, b.length );
+ public void write(byte[] b) throws IOException {
+ write(b, 0, b.length);
}
@Override
- public void write( byte[] b, int off, int len ) throws IOException
- {
- if ( writeBuffer.remaining() < len )
- {
- ( ( Buffer ) writeBuffer ).flip();
- flushBuffer( writeBuffer );
- ( ( Buffer ) writeBuffer ).clear();
+ public void write(byte[] b, int off, int len) throws IOException {
+ if (writeBuffer.remaining() < len) {
+ ((Buffer) writeBuffer).flip();
+ flushBuffer(writeBuffer);
+ ((Buffer) writeBuffer).clear();
}
int capacity = writeBuffer.capacity();
- while ( len >= capacity )
- {
- flushBuffer( ByteBuffer.wrap( b, off, capacity ) );
+ while (len >= capacity) {
+ flushBuffer(ByteBuffer.wrap(b, off, capacity));
off += capacity;
len -= capacity;
}
- if ( len > 0 )
- {
- writeBuffer.put( b, off, len );
+ if (len > 0) {
+ writeBuffer.put(b, off, len);
}
}
@Override
- public void flush() throws IOException
- {
- ( ( Buffer ) writeBuffer ).flip();
- flushBuffer( writeBuffer );
- ( ( Buffer ) writeBuffer ).clear();
+ public void flush() throws IOException {
+ ((Buffer) writeBuffer).flip();
+ flushBuffer(writeBuffer);
+ ((Buffer) writeBuffer).clear();
super.flush();
}
- private void flushBuffer( ByteBuffer writeBuffer ) throws IOException
- {
- if ( modified )
- {
- channel.write( writeBuffer );
- }
- else
- {
+ private void flushBuffer(ByteBuffer writeBuffer) throws IOException {
+ if (modified) {
+ channel.write(writeBuffer);
+ } else {
int len = writeBuffer.remaining();
ByteBuffer readBuffer;
- if ( this.readBuffer.capacity() >= len )
- {
+ if (this.readBuffer.capacity() >= len) {
readBuffer = this.readBuffer;
- ( ( Buffer ) readBuffer ).clear();
- }
- else
- {
- readBuffer = ByteBuffer.allocate( len );
+ ((Buffer) readBuffer).clear();
+ readBuffer.limit(len);
+ } else {
+ readBuffer = ByteBuffer.allocate(len);
}
- while ( len > 0 )
- {
- int read = channel.read( readBuffer );
- if ( read <= 0 )
- {
+ while (len > 0) {
+ int read = channel.read(readBuffer);
+ if (read <= 0) {
modified = true;
- channel.position( channel.position() - readBuffer.position() );
- channel.write( writeBuffer );
+ channel.position(channel.position() - readBuffer.position());
+ channel.write(writeBuffer);
return;
}
len -= read;
}
- ( ( Buffer ) readBuffer ).flip();
- if ( readBuffer.compareTo( writeBuffer ) != 0 )
- {
+ ((Buffer) readBuffer).flip();
+ if (readBuffer.compareTo(writeBuffer) != 0) {
modified = true;
- channel.position( channel.position() - readBuffer.remaining() );
- channel.write( writeBuffer );
+ channel.position(channel.position() - readBuffer.remaining());
+ channel.write(writeBuffer);
}
}
}
@Override
- public void close() throws IOException
- {
- if ( channel.isOpen() )
- {
+ public void close() throws IOException {
+ if (channel.isOpen()) {
flush();
long position = channel.position();
- if ( position != channel.size() )
- {
+ if (position != channel.size()) {
modified = true;
- channel.truncate( position );
+ channel.truncate(position);
}
channel.close();
}
}
- public boolean isModified()
- {
+ public boolean isModified() {
return modified;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/io/CachingWriter.java b/src/main/java/org/codehaus/plexus/util/io/CachingWriter.java
index 23cc4411..98698712 100644
--- a/src/main/java/org/codehaus/plexus/util/io/CachingWriter.java
+++ b/src/main/java/org/codehaus/plexus/util/io/CachingWriter.java
@@ -19,44 +19,35 @@
import java.io.File;
import java.io.IOException;
import java.io.OutputStreamWriter;
-import java.io.StringWriter;
import java.nio.charset.Charset;
-import java.nio.file.Files;
import java.nio.file.Path;
-import java.util.Arrays;
import java.util.Objects;
/**
* Caching Writer to avoid overwriting a file with
* the same content.
*/
-public class CachingWriter extends OutputStreamWriter
-{
+public class CachingWriter extends OutputStreamWriter {
private final CachingOutputStream cos;
- public CachingWriter( File path, Charset charset ) throws IOException
- {
- this( Objects.requireNonNull( path ).toPath(), charset );
+ public CachingWriter(File path, Charset charset) throws IOException {
+ this(Objects.requireNonNull(path).toPath(), charset);
}
- public CachingWriter( Path path, Charset charset ) throws IOException
- {
- this( path, charset, 32 * 1024 );
+ public CachingWriter(Path path, Charset charset) throws IOException {
+ this(path, charset, 32 * 1024);
}
- public CachingWriter( Path path, Charset charset, int bufferSize ) throws IOException
- {
- this( new CachingOutputStream( path, bufferSize ), charset );
+ public CachingWriter(Path path, Charset charset, int bufferSize) throws IOException {
+ this(new CachingOutputStream(path, bufferSize), charset);
}
- private CachingWriter( CachingOutputStream outputStream, Charset charset ) throws IOException
- {
- super( outputStream, charset );
+ private CachingWriter(CachingOutputStream outputStream, Charset charset) throws IOException {
+ super(outputStream, charset);
this.cos = outputStream;
}
- public boolean isModified()
- {
+ public boolean isModified() {
return cos.isModified();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java b/src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java
index bfa5c471..ff6112f0 100644
--- a/src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java
+++ b/src/main/java/org/codehaus/plexus/util/io/InputStreamFacade.java
@@ -23,13 +23,11 @@
* Interface of a wrapper for input streams. This facade is used by methods, which are being implemented for files,
* URL's, or input streams.
*/
-public interface InputStreamFacade
-{
+public interface InputStreamFacade {
/**
* The caller must assume, that this method may be invoked only once.
* @return Retrieves the actual {@link InputStream}.
* @throws IOException if io issue
*/
- InputStream getInputStream()
- throws IOException;
+ InputStream getInputStream() throws IOException;
}
diff --git a/src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java b/src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java
index e634b95f..02fac256 100644
--- a/src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java
+++ b/src/main/java/org/codehaus/plexus/util/io/RawInputStreamFacade.java
@@ -22,21 +22,16 @@
/**
* Implementation of {@link InputStreamFacade} for raw input streams.
*/
-@SuppressWarnings( { "UnusedDeclaration" } )
-public class RawInputStreamFacade
- implements InputStreamFacade
-{
+@SuppressWarnings({"UnusedDeclaration"})
+public class RawInputStreamFacade implements InputStreamFacade {
final InputStream stream;
- public RawInputStreamFacade( InputStream stream )
- {
+ public RawInputStreamFacade(InputStream stream) {
this.stream = stream;
}
@Override
- public InputStream getInputStream()
- throws IOException
- {
+ public InputStream getInputStream() throws IOException {
return stream;
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java b/src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java
index da09b4c1..be5a67ed 100644
--- a/src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java
+++ b/src/main/java/org/codehaus/plexus/util/io/URLInputStreamFacade.java
@@ -23,20 +23,15 @@
/**
* Implementation of {@link InputStreamFacade} for URL's.
*/
-public class URLInputStreamFacade
- implements InputStreamFacade
-{
+public class URLInputStreamFacade implements InputStreamFacade {
private final URL url;
- public URLInputStreamFacade( URL url )
- {
+ public URLInputStreamFacade(URL url) {
this.url = url;
}
@Override
- public InputStream getInputStream()
- throws IOException
- {
+ public InputStream getInputStream() throws IOException {
return url.openStream();
}
}
diff --git a/src/main/java/org/codehaus/plexus/util/reflection/Reflector.java b/src/main/java/org/codehaus/plexus/util/reflection/Reflector.java
index 4f3a9d84..df530ffb 100644
--- a/src/main/java/org/codehaus/plexus/util/reflection/Reflector.java
+++ b/src/main/java/org/codehaus/plexus/util/reflection/Reflector.java
@@ -20,7 +20,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.HashMap;
import java.util.Map;
@@ -30,19 +29,16 @@
*
* @author John Casey
*/
-public final class Reflector
-{
+public final class Reflector {
private static final String CONSTRUCTOR_METHOD_NAME = "$$CONSTRUCTOR$$";
private static final String GET_INSTANCE_METHOD_NAME = "getInstance";
private Map>> classMaps =
- new HashMap>>();
+ new HashMap>>();
/** Ensure no instances of Reflector are created...this is a utility. */
- public Reflector()
- {
- }
+ public Reflector() {}
/**
* Create a new instance of a class, given the array of parameters... Uses constructor caching to find a constructor
@@ -54,50 +50,41 @@ public Reflector()
* @return The instantiated object
* @throws ReflectorException In case anything goes wrong here...
*/
- @SuppressWarnings( { "UnusedDeclaration" } )
- public T newInstance( Class theClass, Object[] params )
- throws ReflectorException
- {
- if ( params == null )
- {
+ @SuppressWarnings({"UnusedDeclaration"})
+ public T newInstance(Class theClass, Object[] params) throws ReflectorException {
+ if (params == null) {
params = new Object[0];
}
Class[] paramTypes = new Class[params.length];
- for ( int i = 0, len = params.length; i < len; i++ )
- {
+ for (int i = 0, len = params.length; i < len; i++) {
paramTypes[i] = params[i].getClass();
}
- try
- {
- Constructor con = getConstructor( theClass, paramTypes );
+ try {
+ Constructor con = getConstructor(theClass, paramTypes);
- if ( con == null )
- {
+ if (con == null) {
StringBuilder buffer = new StringBuilder();
- buffer.append( "Constructor not found for class: " );
- buffer.append( theClass.getName() );
- buffer.append( " with specified or ancestor parameter classes: " );
+ buffer.append("Constructor not found for class: ");
+ buffer.append(theClass.getName());
+ buffer.append(" with specified or ancestor parameter classes: ");
- for ( Class paramType : paramTypes )
- {
- buffer.append( paramType.getName() );
- buffer.append( ',' );
+ for (Class paramType : paramTypes) {
+ buffer.append(paramType.getName());
+ buffer.append(',');
}
- buffer.setLength( buffer.length() - 1 );
+ buffer.setLength(buffer.length() - 1);
- throw new ReflectorException( buffer.toString() );
+ throw new ReflectorException(buffer.toString());
}
- return con.newInstance( params );
- }
- catch ( InstantiationException | InvocationTargetException | IllegalAccessException ex )
- {
- throw new ReflectorException( ex );
+ return con.newInstance(params);
+ } catch (InstantiationException | InvocationTargetException | IllegalAccessException ex) {
+ throw new ReflectorException(ex);
}
}
@@ -111,27 +98,21 @@ public T newInstance( Class theClass, Object[] params )
* @return The singleton object
* @throws ReflectorException In case anything goes wrong here...
*/
- @SuppressWarnings( { "UnusedDeclaration" } )
- public T getSingleton( Class theClass, Object[] initParams )
- throws ReflectorException
- {
+ @SuppressWarnings({"UnusedDeclaration"})
+ public T getSingleton(Class theClass, Object[] initParams) throws ReflectorException {
Class[] paramTypes = new Class[initParams.length];
- for ( int i = 0, len = initParams.length; i < len; i++ )
- {
+ for (int i = 0, len = initParams.length; i < len; i++) {
paramTypes[i] = initParams[i].getClass();
}
- try
- {
- Method method = getMethod( theClass, GET_INSTANCE_METHOD_NAME, paramTypes );
+ try {
+ Method method = getMethod(theClass, GET_INSTANCE_METHOD_NAME, paramTypes);
// noinspection unchecked
- return (T) method.invoke( null, initParams );
- }
- catch ( InvocationTargetException | IllegalAccessException ex )
- {
- throw new ReflectorException( ex );
+ return (T) method.invoke(null, initParams);
+ } catch (InvocationTargetException | IllegalAccessException ex) {
+ throw new ReflectorException(ex);
}
}
@@ -144,113 +125,86 @@ public T getSingleton( Class