From 5926dd2bd27694030dfca5821bdc81bd5da2032b Mon Sep 17 00:00:00 2001 From: Patrick Gotthard Date: Sun, 13 Apr 2014 20:29:52 +0200 Subject: [PATCH] Replaced Collection.size() > 0 through !Collection.isEmpty() --- .../propono/atom/client/ClientCollection.java | 2 +- .../org/rometools/propono/atom/client/ClientEntry.java | 2 +- .../propono/atom/client/ClientMediaEntry.java | 2 +- .../org/rometools/propono/atom/common/Collection.java | 2 +- .../propono/blogclient/atomprotocol/AtomEntry.java | 4 ++-- .../propono/blogclient/metaweblog/MetaWeblogEntry.java | 2 +- .../rometools/propono/atom/client/AtomClientTest.java | 10 +++++----- .../rometools/propono/atom/common/AtomServiceTest.java | 2 +- .../propono/atom/server/AtomClientServerTest.java | 10 +++++----- .../propono/blogclient/SimpleBlogClientTest.java | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/rometools/propono/atom/client/ClientCollection.java b/src/main/java/org/rometools/propono/atom/client/ClientCollection.java index dbd047c..613291f 100644 --- a/src/main/java/org/rometools/propono/atom/client/ClientCollection.java +++ b/src/main/java/org/rometools/propono/atom/client/ClientCollection.java @@ -208,7 +208,7 @@ public class ClientCollection extends Collection { } final List acceptElems = element.getChildren("accept", AtomService.ATOM_PROTOCOL); - if (acceptElems != null && acceptElems.size() > 0) { + if (acceptElems != null && !acceptElems.isEmpty()) { for (final Element acceptElem : acceptElems) { addAccept(acceptElem.getTextTrim()); } diff --git a/src/main/java/org/rometools/propono/atom/client/ClientEntry.java b/src/main/java/org/rometools/propono/atom/client/ClientEntry.java index f8357f0..29653ae 100644 --- a/src/main/java/org/rometools/propono/atom/client/ClientEntry.java +++ b/src/main/java/org/rometools/propono/atom/client/ClientEntry.java @@ -104,7 +104,7 @@ public class ClientEntry extends Entry { * one content element per entry. */ public Content getContent() { - if (getContents() != null && getContents().size() > 0) { + if (getContents() != null && !getContents().isEmpty()) { final Content c = getContents().get(0); return c; } diff --git a/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java b/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java index 0578e31..5ce7dd0 100644 --- a/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java +++ b/src/main/java/org/rometools/propono/atom/client/ClientMediaEntry.java @@ -156,7 +156,7 @@ public class ClientMediaEntry extends ClientEntry { * resource data as an InputStream or as a byte array. */ public InputStream getAsStream() throws ProponoException { - if (getContents() != null && getContents().size() > 0) { + if (getContents() != null && !getContents().isEmpty()) { final Content c = getContents().get(0); if (c.getSrc() != null) { return getResourceAsStream(); diff --git a/src/main/java/org/rometools/propono/atom/common/Collection.java b/src/main/java/org/rometools/propono/atom/common/Collection.java index 883bdfe..56f7343 100644 --- a/src/main/java/org/rometools/propono/atom/common/Collection.java +++ b/src/main/java/org/rometools/propono/atom/common/Collection.java @@ -241,7 +241,7 @@ public class Collection { } final List acceptElems = element.getChildren("accept", AtomService.ATOM_PROTOCOL); - if (acceptElems != null && acceptElems.size() > 0) { + if (acceptElems != null && !acceptElems.isEmpty()) { for (final Element acceptElem : acceptElems) { addAccept(acceptElem.getTextTrim()); } diff --git a/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomEntry.java b/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomEntry.java index b33462b..0f8bca6 100644 --- a/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomEntry.java +++ b/src/main/java/org/rometools/propono/blogclient/atomprotocol/AtomEntry.java @@ -151,7 +151,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { } final List contents = entry.getContents(); com.sun.syndication.feed.atom.Content romeContent = null; - if (contents != null && contents.size() > 0) { + if (contents != null && !contents.isEmpty()) { romeContent = contents.get(0); } if (romeContent != null) { @@ -172,7 +172,7 @@ public class AtomEntry extends BaseBlogEntry implements BlogEntry { categories = cats; } final List authors = entry.getAuthors(); - if (authors != null && authors.size() > 0) { + if (authors != null && !authors.isEmpty()) { final com.sun.syndication.feed.atom.Person romeAuthor = (com.sun.syndication.feed.atom.Person) authors.get(0); if (romeAuthor != null) { author = new Person(); diff --git a/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java b/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java index 4fde98d..1e6752f 100644 --- a/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java +++ b/src/main/java/org/rometools/propono/blogclient/metaweblog/MetaWeblogEntry.java @@ -106,7 +106,7 @@ public class MetaWeblogEntry extends BaseBlogEntry { if (getContent() != null && getContent().getValue() != null) { struct.put("description", getContent().getValue()); } - if (getCategories() != null && getCategories().size() > 0) { + if (getCategories() != null && !getCategories().isEmpty()) { final List catArray = new ArrayList(); final List cats = getCategories(); for (int i = 0; i < cats.size(); i++) { diff --git a/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java b/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java index f507618..4d20be3 100644 --- a/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java +++ b/src/test/java/org/rometools/propono/atom/client/AtomClientTest.java @@ -115,7 +115,7 @@ public class AtomClientTest extends TestCase { */ public void testGetAtomService() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; assertNotNull(space.getTitle()); @@ -135,7 +135,7 @@ public class AtomClientTest extends TestCase { */ public void testSimpleEntryPostAndRemove() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; @@ -183,7 +183,7 @@ public class AtomClientTest extends TestCase { */ public void testSimpleEntryPostUpdateAndRemove() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; @@ -266,7 +266,7 @@ public class AtomClientTest extends TestCase { */ public void testEntryPostWithCategories() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element2 : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element2; @@ -359,7 +359,7 @@ public class AtomClientTest extends TestCase { */ public void testMediaPost() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; diff --git a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java index 0a04230..54d67db 100644 --- a/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java +++ b/src/test/java/org/rometools/propono/atom/common/AtomServiceTest.java @@ -69,7 +69,7 @@ public class AtomServiceTest extends TestCase { assertNotNull(col.getTitle()); assertNotNull(col.getHrefResolved()); int catCount = 0; - if (col.getCategories().size() > 0) { + if (!col.getCategories().isEmpty()) { for (final Object element3 : col.getCategories()) { final Categories cats = (Categories) element3; catCount += cats.getCategories().size(); diff --git a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java index dd51961..cde332b 100644 --- a/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java +++ b/src/test/java/org/rometools/propono/atom/server/AtomClientServerTest.java @@ -147,7 +147,7 @@ public class AtomClientServerTest { @Test public void testGetAtomService() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); for (final Workspace workspace : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) workspace; assertNotNull(space.getTitle()); @@ -168,7 +168,7 @@ public class AtomClientServerTest { @Test public void testSimpleEntryPostAndRemove() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; @@ -217,7 +217,7 @@ public class AtomClientServerTest { @Test public void testSimpleEntryPostUpdateAndRemove() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; @@ -302,7 +302,7 @@ public class AtomClientServerTest { @Test public void testEntryPostWithCategories() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element2 : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element2; @@ -395,7 +395,7 @@ public class AtomClientServerTest { */ public void testMediaPost() throws Exception { assertNotNull(service); - assertTrue(service.getWorkspaces().size() > 0); + assertTrue(!service.getWorkspaces().isEmpty()); int count = 0; for (final Object element : service.getWorkspaces()) { final ClientWorkspace space = (ClientWorkspace) element; diff --git a/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java b/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java index 9b9ebec..f5584ac 100644 --- a/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java +++ b/src/test/java/org/rometools/propono/blogclient/SimpleBlogClientTest.java @@ -130,7 +130,7 @@ public class SimpleBlogClientTest extends TestCase { final BlogConnection conn = BlogConnectionFactory.getBlogConnection(type, endpoint, username, password); assertNotNull(conn); - assertTrue(conn.getBlogs().size() > 0); + assertTrue(!conn.getBlogs().isEmpty()); int count = 0; for (final Blog blog2 : conn.getBlogs()) { final Blog blog = blog2;