You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2017/11/07 10:17:33 UTC
[sling-org-apache-sling-settings] 14/21: SLING-5190 factor out of
SlingSettingsServiceImpl a Sling ID util
This is an automated email from the ASF dual-hosted git repository.
rombert pushed a commit to annotated tag org.apache.sling.settings-1.3.8
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-settings.git
commit 6357e3efa58fb06e9f88f2ee37639e68414309e4
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Fri Oct 23 15:37:01 2015 +0000
SLING-5190 factor out of SlingSettingsServiceImpl a Sling ID util
* make the Sling ID length an internal of SlingIdUtil
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1710243 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/settings/impl/SlingIdUtil.java | 9 ++++++---
.../sling/settings/impl/SlingSettingsServiceImpl.java | 5 +----
.../sling/settings/impl/SlingSettingsServiceImplTest.java | 14 +++++++-------
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java b/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
index 23875f1..29ad3ea 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
@@ -28,6 +28,9 @@ import java.util.UUID;
public class SlingIdUtil {
+ /** The length in bytes of a sling identifier */
+ private static final int SLING_ID_LENGTH = 36;
+
public static String createSlingId() {
return UUID.randomUUID().toString();
}
@@ -35,11 +38,11 @@ public class SlingIdUtil {
/**
* Read the id from a file.
*/
- public static String readSlingId(final File idFile, int maxLength) throws IOException {
- if (idFile.exists() && idFile.length() >= maxLength) {
+ public static String readSlingId(final File idFile) throws IOException {
+ if (idFile.exists() && idFile.length() >= SLING_ID_LENGTH) {
DataInputStream dis = null;
try {
- final byte[] rawBytes = new byte[maxLength];
+ final byte[] rawBytes = new byte[SLING_ID_LENGTH];
dis = new DataInputStream(new FileInputStream(idFile));
dis.readFully(rawBytes);
final String rawString = new String(rawBytes, "ISO-8859-1");
diff --git a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
index 07eea4b..56b5aa7 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
@@ -76,9 +76,6 @@ public class SlingSettingsServiceImpl
/** The name of the data file holding install run mode options */
private static final String OPTIONS_FILE = "sling.options.file";
- /** The length in bytes of a sling identifier */
- private static final int SLING_ID_LENGTH = 36;
-
/** The properties for name, description. */
private final Map<String, String> slingProps = new HashMap<String, String>();
@@ -128,7 +125,7 @@ public class SlingSettingsServiceImpl
}
try {
- slingId = SlingIdUtil.readSlingId(idFile, SLING_ID_LENGTH);
+ slingId = SlingIdUtil.readSlingId(idFile);
logger.info("Read Sling ID {} from file {}", slingId, idFile);
} catch (final Throwable t) {
logger.error("Failed reading Sling ID from file " + idFile, t);
diff --git a/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java b/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
index 732f69b..b4cc5e7 100644
--- a/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
+++ b/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
@@ -69,7 +69,7 @@ public class SlingSettingsServiceImplTest {
@Test
public void testGenerateSlingId()
throws IOException {
- String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ String slingId = readSlingId(slingIdFile, optionsFile);
Assert.assertNotNull(slingId);
}
@@ -77,10 +77,10 @@ public class SlingSettingsServiceImplTest {
public void testGetSlingId()
throws IOException {
writeSlingId(slingIdFile, optionsFile, SLING_ID);
- String generated = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ String generated = readSlingId(slingIdFile, optionsFile);
Assert.assertNotNull(generated);
Assert.assertEquals(SLING_ID, generated);
- String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ String slingId = readSlingId(slingIdFile, optionsFile);
Assert.assertNotNull(slingId);
Assert.assertEquals(generated, slingId);
}
@@ -90,7 +90,7 @@ public class SlingSettingsServiceImplTest {
throws IOException {
String data = SLING_ID + RandomStringUtils.randomAscii(1024 * 1024); // 1MB long random String
writeSlingId(slingIdFile, optionsFile, data);
- String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ String slingId = readSlingId(slingIdFile, optionsFile);
Assert.assertNotNull(slingId);
Assert.assertEquals(SLING_ID, slingId);
}
@@ -100,15 +100,15 @@ public class SlingSettingsServiceImplTest {
throws IOException {
String data = RandomStringUtils.randomAscii(8); // 8 byte long string
writeSlingId(slingIdFile, optionsFile, data);
- String slingId = readSlingId(slingIdFile, optionsFile, SLING_ID.length());
+ String slingId = readSlingId(slingIdFile, optionsFile);
Assert.assertNotNull(slingId);
Assert.assertNotEquals(SLING_ID, slingId);
}
- private String readSlingId(File slingIdFile, File optionsFile, int maxLength)
+ private String readSlingId(File slingIdFile, File optionsFile)
throws IOException {
SlingSettingsServiceImpl settings = getSlingSettings(slingIdFile, optionsFile);
- return SlingIdUtil.readSlingId(slingIdFile, maxLength);
+ return SlingIdUtil.readSlingId(slingIdFile);
}
private void writeSlingId(File slingIdFile, File optionsFile, String slingId)
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.