You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ol...@apache.org on 2015/10/23 16:34:26 UTC
svn commit: r1710223 - in
/sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl:
SlingIdUtil.java SlingSettingsServiceImpl.java
Author: olli
Date: Fri Oct 23 14:34:26 2015
New Revision: 1710223
URL: http://svn.apache.org/viewvc?rev=1710223&view=rev
Log:
SLING-5190 factor out of SlingSettingsServiceImpl a Sling ID util
* add createSlingId():String
Modified:
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
Modified: sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java?rev=1710223&r1=1710222&r2=1710223&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java (original)
+++ sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java Fri Oct 23 14:34:26 2015
@@ -28,6 +28,10 @@ import java.util.UUID;
public class SlingIdUtil {
+ static String createSlingId() {
+ return UUID.randomUUID().toString();
+ }
+
/**
* Read the id from a file.
*/
Modified: sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java?rev=1710223&r1=1710222&r2=1710223&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java (original)
+++ sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingSettingsServiceImpl.java Fri Oct 23 14:34:26 2015
@@ -35,7 +35,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.UUID;
import org.apache.sling.launchpad.api.StartupHandler;
import org.apache.sling.launchpad.api.StartupMode;
@@ -137,7 +136,7 @@ public class SlingSettingsServiceImpl
// no sling id yet or failure to read file: create an id and store
if (slingId == null) {
- slingId = UUID.randomUUID().toString();
+ slingId = SlingIdUtil.createSlingId();
logger.info("Created new Sling ID {}", slingId);
try {
SlingIdUtil.writeSlingId(idFile, slingId);