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:37 UTC
[sling-org-apache-sling-settings] 18/21: style
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 43aced2ae9f979028edb3d455bf6fa1773537629
Author: Oliver Lietz <ol...@apache.org>
AuthorDate: Sun Oct 25 11:15:28 2015 +0000
style
git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/bundles/extensions/settings@1710426 13f79535-47bb-0310-9956-ffa450edef68
---
.../java/org/apache/sling/settings/impl/SlingIdUtil.java | 10 +++++++---
.../sling/settings/impl/SlingSettingsServiceImplTest.java | 15 ++++++++-------
2 files changed, 15 insertions(+), 10 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 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 @@ 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) {
+ }
}
}
}
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 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 SlingSettingsServiceImplTest {
final SlingSettingsService slingSettingsService = createSlingSettingsService(slingIdFile, optionsFile);
final String slingId = slingSettingsService.getSlingId();
- Assert.assertNotNull(slingId);
+ assertNotNull(slingId);
}
@Test
@@ -80,8 +81,8 @@ public class SlingSettingsServiceImplTest {
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 SlingSettingsServiceImplTest {
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 SlingSettingsServiceImplTest {
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 {
--
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.