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/25 12:15:29 UTC
svn commit: r1710426 - in /sling/trunk/bundles/extensions/settings/src:
main/java/org/apache/sling/settings/impl/SlingIdUtil.java
test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
Author: olli
Date: Sun Oct 25 11:15:28 2015
New Revision: 1710426
URL: http://svn.apache.org/viewvc?rev=1710426&view=rev
Log:
style
Modified:
sling/trunk/bundles/extensions/settings/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.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=1710426&r1=1710425&r2=1710426&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 Sun Oct 25 11:15:28 2015
@@ -28,7 +28,9 @@ import java.util.UUID;
public class SlingIdUtil {
- /** The length in bytes of a sling identifier */
+ /**
+ * The length in bytes of a sling identifier
+ */
private static final int SLING_ID_LENGTH = 36;
public static String createSlingId() {
@@ -53,7 +55,8 @@ public class SlingIdUtil {
if (dis != null) {
try {
dis.close();
- } catch (IOException ignore){}
+ } catch (IOException ignore) {
+ }
}
}
}
@@ -76,7 +79,8 @@ public class SlingIdUtil {
if (dos != null) {
try {
dos.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
}
}
}
Modified: sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java?rev=1710426&r1=1710425&r2=1710426&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java (original)
+++ sling/trunk/bundles/extensions/settings/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java Sun Oct 25 11:15:28 2015
@@ -28,12 +28,13 @@ import java.util.List;
import org.apache.commons.lang.RandomStringUtils;
import org.apache.sling.settings.SlingSettingsService;
import org.junit.After;
-import org.junit.Assert;
import org.apache.sling.launchpad.api.StartupHandler;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -70,7 +71,7 @@ public class SlingSettingsServiceImplTes
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
+ assertNotNull(slingId);
}
@Test
@@ -80,8 +81,8 @@ public class SlingSettingsServiceImplTes
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
- Assert.assertEquals(expected, slingId);
+ assertNotNull(slingId);
+ assertEquals(expected, slingId);
}
@Test
@@ -92,8 +93,8 @@ public class SlingSettingsServiceImplTes
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
- Assert.assertEquals(expected, slingId);
+ assertNotNull(slingId);
+ assertEquals(expected, slingId);
}
@Test
@@ -103,7 +104,7 @@ public class SlingSettingsServiceImplTes
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
+ assertNotNull(slingId);
}
private SlingSettingsService createSlingSettingsService(final File slingIdFile, final File optionsFile) throws IOException {