style
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1710426 13f79535-47bb-0310-9956-ffa450edef68
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 29ad3ea..4b1995a 100644
--- a/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
+++ b/src/main/java/org/apache/sling/settings/impl/SlingIdUtil.java
@@ -28,7 +28,9 @@
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 @@
if (dis != null) {
try {
dis.close();
- } catch (IOException ignore){}
+ } catch (IOException ignore) {
+ }
}
}
}
@@ -76,7 +79,8 @@
if (dos != null) {
try {
dos.close();
- } catch (IOException ignore) {}
+ } catch (IOException ignore) {
+ }
}
}
}
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 55ee328..f50fed2 100644
--- a/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
+++ b/src/test/java/org/apache/sling/settings/impl/SlingSettingsServiceImplTest.java
@@ -28,12 +28,13 @@
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 @@
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
+ assertNotNull(slingId);
}
@Test
@@ -80,8 +81,8 @@
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 @@
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 @@
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 {
