dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #14595
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5010: Removed obsolete class
------------------------------------------------------------
revno: 5010
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-10-23 15:33:34 +0200
message:
Removed obsolete class
removed:
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodeUtils.java
dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java
dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CodeGeneratorTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java 2011-10-22 20:51:02 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/CodeGenerator.java 2011-10-23 13:33:34 +0000
@@ -1,8 +1,5 @@
package org.hisp.dhis.common;
-
-import java.security.SecureRandom;
-
/*
* Copyright (c) 2004-2005, University of Oslo
* All rights reserved.
@@ -30,32 +27,33 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.security.SecureRandom;
+
/**
- *
* @author bobj
- * @version created 22-Oct-2011
*/
-public class CodeGenerator {
-
- public static final String allowedChars = "0123456789" +
- "abcdefghijklmnopqrstuvwxyz" + "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+public class CodeGenerator
+{
+ public static final String allowedChars = "0123456789" + "abcdefghijklmnopqrstuvwxyz"
+ + "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
public static final int codeSize = 11;
/**
* Generates a pseudo random string using the allowed characters
- *
+ *
* @return the Code
*/
public static String generateCode()
{
- // using the system default algorithm and seed
+ // Using the system default algorithm and seed
SecureRandom sr = new SecureRandom();
char[] randomChars = new char[11];
- for (int i = 0; i< codeSize; ++i) {
- randomChars[i] = allowedChars.charAt( sr.nextInt( 61) );
+ for ( int i = 0; i < codeSize; ++i )
+ {
+ randomChars[i] = allowedChars.charAt( sr.nextInt( 61 ) );
}
- return new String(randomChars);
+ return new String( randomChars );
}
}
=== modified file 'dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CodeGeneratorTest.java'
--- dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CodeGeneratorTest.java 2011-10-22 20:37:04 +0000
+++ dhis-2/dhis-api/src/test/java/org/hisp/dhis/common/CodeGeneratorTest.java 2011-10-23 13:33:34 +0000
@@ -34,25 +34,24 @@
import static org.junit.Assert.*;
/**
- *
* @author bobj
- * @version created 22-Oct-2011
*/
-public class CodeGeneratorTest {
-
+public class CodeGeneratorTest
+{
@Test
public void testCode()
{
// set this as high as your heap space allows
- int numberOfCodes=1000;
+ int numberOfCodes = 1000;
- Set<String> Codes = new HashSet<String>();
- for (int n=0; n<numberOfCodes; ++n) {
+ Set<String> codes = new HashSet<String>();
+ for ( int n = 0; n < numberOfCodes; ++n )
+ {
String code = CodeGenerator.generateCode();
// test syntax
- assertTrue(code.matches( "[0-9a-zA-Z]{11}"));
+ assertTrue( code.matches( "[0-9a-zA-Z]{11}" ) );
// test uniqueness
- assertTrue(Codes.add( code));
+ assertTrue( codes.add( code ) );
}
}
}
=== removed file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodeUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodeUtils.java 2011-10-20 16:52:57 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/CodeUtils.java 1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-package org.hisp.dhis.system.util;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING 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.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-/**
- * @author Lars Helge Overland
- */
-public class CodeUtils
-{
- public static final int CODE_LENGTH = 11;
-
- private static final List<Character> CHAR_SET = Arrays.asList(
- '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', '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',
- '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '~' );
-
- private static final int CHAR_MAX = CHAR_SET.size() - 1;
-
- public static String generateCode()
- {
- Random r = new Random();
-
- StringBuilder code = new StringBuilder();
-
- for ( int i = 0; i < CODE_LENGTH; i++ )
- {
- code.append( CHAR_SET.get( r.nextInt( CHAR_MAX ) ) );
- }
-
- return code.toString();
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java 2011-02-27 20:49:36 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/CodecUtilsTest.java 1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-package org.hisp.dhis.system.util;
-
-/*
- * Copyright (c) 2004-2010, University of Oslo
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- * * Neither the name of the HISP project nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-import org.junit.Test;
-
-import static junit.framework.Assert.*;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class CodecUtilsTest
-{
- @Test
- public void testEncrypt()
- {
- assertEquals( "ZGhpcw==", CodecUtils.encryptBase64( "dhis" ) );
- }
-
- @Test
- public void testDecrypt()
- {
- assertEquals( "dhis", CodecUtils.decryptBase64( "ZGhpcw==" ) );
- }
-
- @Test
- public void testFilenameEncode()
- {
- assertEquals( "foobar", CodecUtils.filenameEncode( "foo?%*bar" ) );
- assertEquals( "foobar", CodecUtils.filenameEncode( "%foo/:|bar<>" ) );
- assertEquals( "foobar", CodecUtils.filenameEncode( "?foo.bar/" ) );
- assertEquals( "foobar", CodecUtils.filenameEncode( "'foo'bar'" ) );
- }
-}
