You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pp...@apache.org on 2023/06/28 08:18:11 UTC
[camel] 01/03: CAMEL-19495 - Avoid using Guava where possible
This is an automated email from the ASF dual-hosted git repository.
ppalaga pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 91bc716c142a90c508f6fab6e7a5f4e1e8f3a55f
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Fri Jun 23 22:12:17 2023 +0200
CAMEL-19495 - Avoid using Guava where possible
---
components/camel-wordpress/pom.xml | 5 ----
.../wordpress/api/WordpressAPIConfiguration.java | 4 +---
.../wordpress/api/WordpressServiceProvider.java | 9 +++-----
.../api/auth/BaseWordpressAuthentication.java | 4 +---
.../component/wordpress/api/model/Comment.java | 8 ++-----
.../wordpress/api/model/PostRevision.java | 4 +---
.../wordpress/api/model/SearchCriteria.java | 6 +----
.../wordpress/api/model/TextPublishable.java | 7 +-----
.../camel/component/wordpress/api/model/User.java | 5 +---
.../impl/AbstractWordpressCrudServiceAdapter.java | 27 ++++++++++++++--------
.../impl/AbstractWordpressServiceAdapter.java | 7 ++----
.../impl/WordpressServiceCategoriesAdapter.java | 5 ++--
.../impl/WordpressServiceCommentsAdapter.java | 7 ++----
.../service/impl/WordpressServicePagesAdapter.java | 10 ++++----
.../service/impl/WordpressServicePostsAdapter.java | 12 +++++-----
.../service/impl/WordpressServiceTagsAdapter.java | 5 ++--
.../impl/WordpressServiceTaxonomyAdapter.java | 6 ++---
.../impl/WordpressSevicePostRevisionAdapter.java | 22 ++++++++++++------
18 files changed, 64 insertions(+), 89 deletions(-)
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 9a4410c2002..ac39aa0cda6 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -93,10 +93,5 @@
<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jakarta-rs-json-provider</artifactId>
</dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava-eventbus-version}</version>
- </dependency>
</dependencies>
</project>
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
index 7d32f01af5b..698d520deb8 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressAPIConfiguration.java
@@ -21,7 +21,6 @@ import java.util.Objects;
import org.apache.camel.component.wordpress.api.auth.WordpressAuthentication;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static java.util.Objects.hash;
/**
@@ -69,8 +68,7 @@ public final class WordpressAPIConfiguration implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).addValue(this.apiUrl).add("Version", this.apiVersion).addValue(this.authentication)
- .toString();
+ return "WordpressAPIConfiguration{" + this.apiUrl + ", Version=" + this.apiVersion + ", " + this.authentication + "}";
}
@Override
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
index f26c98b2a49..f6a50d25e4b 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/WordpressServiceProvider.java
@@ -23,13 +23,10 @@ import org.apache.camel.component.wordpress.api.service.WordpressServicePosts;
import org.apache.camel.component.wordpress.api.service.WordpressServiceUsers;
import org.apache.camel.component.wordpress.api.service.impl.WordpressServicePostsAdapter;
import org.apache.camel.component.wordpress.api.service.impl.WordpressServiceUsersAdapter;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
-import static com.google.common.base.Strings.isNullOrEmpty;
-
public final class WordpressServiceProvider {
private static final Logger LOGGER = LoggerFactory.getLogger(WordpressServiceProvider.class);
@@ -58,10 +55,10 @@ public final class WordpressServiceProvider {
}
public void init(WordpressAPIConfiguration config) {
- checkNotNull(emptyToNull(config.getApiUrl()),
+ ObjectHelper.notNullOrEmpty(config.getApiUrl(),
"Please inform the Wordpress API url , eg.: http://myblog.com/wp-json/wp");
- if (isNullOrEmpty(config.getApiVersion())) {
+ if (config.getApiVersion() == null || config.getApiVersion().isEmpty()) {
config.setApiVersion(WordpressConstants.API_VERSION);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
index a8eb26917d1..a2715c752e5 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/auth/BaseWordpressAuthentication.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.wordpress.api.auth;
-import com.google.common.base.Strings;
-
abstract class BaseWordpressAuthentication implements WordpressAuthentication {
protected String username;
@@ -52,6 +50,6 @@ abstract class BaseWordpressAuthentication implements WordpressAuthentication {
}
protected final boolean isCredentialsSet() {
- return !Strings.isNullOrEmpty(username) && !Strings.isNullOrEmpty(password);
+ return username != null && !username.isEmpty() && password != null && !password.isEmpty();
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
index c641cc7c1fa..6a8cb85d46e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/Comment.java
@@ -24,8 +24,6 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JsonIgnoreProperties(ignoreUnknown = true)
public class Comment implements Serializable {
@@ -209,10 +207,8 @@ public class Comment implements Serializable {
@Override
public String toString() {
- // @formatter:off
- return toStringHelper(this).add("ID", this.id).addValue(this.authorName).addValue(this.authorEmail).addValue(this.date)
- .addValue(this.status).add("PostID", this.parent).toString();
- // @formatter:on
+ return "Comment{ID=" + getId() + ", " + this.authorName + ", " + this.authorEmail + ", " + this.date + ", "
+ + this.status + ", PostID=" + this.parent + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
index 90a91e50683..1837e416cd9 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/PostRevision.java
@@ -20,8 +20,6 @@ import java.io.Serializable;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JsonIgnoreProperties(ignoreUnknown = true)
public class PostRevision extends Publishable implements Serializable {
@@ -83,7 +81,7 @@ public class PostRevision extends Publishable implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).add("ID", this.getId()).add("PostID", this.parent).addValue(this.getTitle()).toString();
+ return "PostRevision{ID=" + getId() + ", PostID=" + this.parent + ", " + getTitle() + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
index 8437ec39d9e..503f9588ae1 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/SearchCriteria.java
@@ -19,8 +19,6 @@ package org.apache.camel.component.wordpress.api.model;
import java.io.Serializable;
import java.util.List;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
/**
* Search criterias.
*/
@@ -85,9 +83,7 @@ public class SearchCriteria implements Serializable {
@Override
public String toString() {
- // @formatter:off
- return toStringHelper(this).add("Query", this.search).add("Page", page).add("Per Page", perPage).addValue(this.order)
- .toString();
+ return "SearchCriteria{Query=" + search + ", Page=" + page + ", Per Page=" + perPage + ", " + order + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
index 825dc858c67..7b5c2d2338c 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/TextPublishable.java
@@ -22,8 +22,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
/**
* Describes a object that may be published on the Wordpress engine, eg. a Post, a Page etc.
*/
@@ -160,11 +158,8 @@ public abstract class TextPublishable extends Publishable {
this.template = template;
}
- // @formatter:off
@Override
public String toString() {
- return toStringHelper(this).add("ID", this.getId()).add("Status", this.getStatus()).addValue(this.guid)
- .addValue(this.getTitle()).toString();
+ return "PostRevision{ID=" + getId() + ", Status=" + this.getStatus() + ", " + guid + "}";
}
- // @formatter:on
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
index d073627755e..c2376828f66 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/model/User.java
@@ -24,8 +24,6 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-import static com.google.common.base.MoreObjects.toStringHelper;
-
@JacksonXmlRootElement
@JsonIgnoreProperties(ignoreUnknown = true)
public class User implements Serializable {
@@ -207,8 +205,7 @@ public class User implements Serializable {
@Override
public String toString() {
- return toStringHelper(this).addValue(this.id).addValue(this.username).addValue(this.email).addValue(this.name)
- .toString();
+ return "User{" + id + ", " + username + ", " + email + ", " + name + "}";
}
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
index 15b04beea58..27eeb7d9be3 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressCrudServiceAdapter.java
@@ -16,14 +16,13 @@
*/
package org.apache.camel.component.wordpress.api.service.impl;
+import java.util.Objects;
+
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.DeletedModel;
import org.apache.camel.component.wordpress.api.model.SearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressCrudService;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* Base service adapter implementation with CRUD commons operations.
*
@@ -39,7 +38,7 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T create(T object) {
- checkNotNull(object, "Please define an object to create");
+ Objects.requireNonNull(object, "Please define an object to create");
return this.doCreate(object);
}
@@ -47,13 +46,17 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T delete(Integer id) {
- checkArgument(id > 0, "The id is mandatory");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doDelete(id);
}
@Override
public final DeletedModel<T> forceDelete(Integer id) {
- checkArgument(id > 0, "The id is mandatory");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doForceDelete(id);
}
@@ -70,8 +73,10 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T update(Integer id, T object) {
- checkNotNull(object, "Please define an object to update");
- checkArgument(id > 0, "The id is mandatory");
+ Objects.requireNonNull(object, "Please define an object to update");
+ if (!(id > 0)) {
+ throw new IllegalArgumentException("The id is mandatory");
+ }
return this.doUpdate(id, object);
}
@@ -84,8 +89,10 @@ abstract class AbstractWordpressCrudServiceAdapter<A, T, S extends SearchCriteri
@Override
public final T retrieve(Integer entityID, Context context) {
- checkArgument(entityID > 0, "Please provide a non zero id");
- checkNotNull(context, "Provide a context");
+ if (!(entityID > 0)) {
+ throw new IllegalArgumentException("Please provide a non zero id");
+ }
+ Objects.requireNonNull(context, "Provide a context");
// return this.getSpi().retrieve(getApiVersion(), entityID, context);
return doRetrieve(entityID, context);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
index 2bcd29e81a5..4804ad60e10 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/AbstractWordpressServiceAdapter.java
@@ -23,6 +23,7 @@ import jakarta.ws.rs.core.MediaType;
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import org.apache.camel.component.wordpress.api.auth.WordpressAuthentication;
import org.apache.camel.component.wordpress.api.service.WordpressService;
+import org.apache.camel.util.ObjectHelper;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
@@ -30,9 +31,6 @@ import org.apache.cxf.jaxrs.client.WebClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
-
abstract class AbstractWordpressServiceAdapter<A> implements WordpressService {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractWordpressServiceAdapter.class);
@@ -42,8 +40,7 @@ abstract class AbstractWordpressServiceAdapter<A> implements WordpressService {
private WordpressAuthentication authentication;
AbstractWordpressServiceAdapter(final String wordpressUrl, final String apiVersion) {
- checkNotNull(emptyToNull(apiVersion));
- this.apiVersion = apiVersion;
+ this.apiVersion = ObjectHelper.notNullOrEmpty(apiVersion, "apiVersion");
// @formatter:off
this.spi = JAXRSClientFactory.create(wordpressUrl, this.getSpiType(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
index 6a554573d81..1a2d00e7608 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCategoriesAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Category;
import org.apache.camel.component.wordpress.api.model.CategorySearchCriteria;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.service.WordpressServiceCategories;
import org.apache.camel.component.wordpress.api.service.spi.CategoriesSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceCategoriesAdapter
extends AbstractWordpressCrudServiceAdapter<CategoriesSPI, Category, CategorySearchCriteria>
implements WordpressServiceCategories {
@@ -42,7 +41,7 @@ public class WordpressServiceCategoriesAdapter
// @formatter:off
@Override
public List<Category> list(CategorySearchCriteria criteria) {
- checkNotNull(criteria, "The search criteria must be defined");
+ Objects.requireNonNull(criteria, "The search criteria must be defined");
return getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getExclude(), criteria.getInclude(),
criteria.getOrder(), criteria.getOrderBy(), criteria.isHideEmpty(), criteria.getParent(), criteria.getPostId(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
index fad100b0fa5..b01a69b4549 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceCommentsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Comment;
import org.apache.camel.component.wordpress.api.model.CommentSearchCriteria;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.service.WordpressServiceComments;
import org.apache.camel.component.wordpress.api.service.spi.CommentsSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceCommentsAdapter
extends AbstractWordpressCrudServiceAdapter<CommentsSPI, Comment, CommentSearchCriteria>
implements WordpressServiceComments {
@@ -39,16 +38,14 @@ public class WordpressServiceCommentsAdapter
return CommentsSPI.class;
}
- // @formatter:off
@Override
public List<Comment> list(CommentSearchCriteria c) {
- checkNotNull(c, "The search criteria must be defined");
+ Objects.requireNonNull(c, "The search criteria must be defined");
return getSpi().list(this.getApiVersion(), c.getContext(), c.getPage(), c.getPerPage(), c.getSearch(), c.getAfter(),
c.getAuthor(), c.getAuthorExclude(), c.getAuthorEmail(), c.getBefore(),
c.getExclude(), c.getInclude(), c.getKarma(), c.getOffset(), c.getOrder(), c.getOrderBy(), c.getParent(),
c.getParentExclude(), c.getPost(), c.getStatus(), c.getType());
}
- // @formatter:on
@Override
protected Comment doCreate(Comment object) {
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
index 3fd527c1d60..af5bab46cdb 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePagesAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Page;
@@ -29,9 +30,6 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* The {@link WordpressServicePosts} implementation. Aggregates the {@link PostsSPI} interface using
* {@link JAXRSClientFactory} to make the API calls.
@@ -56,7 +54,7 @@ public class WordpressServicePagesAdapter extends AbstractWordpressCrudServiceAd
@Override
public List<Page> list(PageSearchCriteria c) {
LOGGER.debug("Calling list pages: searchCriteria {}", c);
- checkNotNull(c, "Please provide a search criteria");
+ Objects.requireNonNull(c, "Please provide a search criteria");
return getSpi().list(this.getApiVersion(), c.getContext(), c.getPage(), c.getPerPage(), c.getSearch(), c.getAfter(),
c.getAuthor(), c.getAuthorExclude(), c.getBefore(), c.getExclude(),
c.getInclude(), c.getMenuOrder(), c.getOffset(), c.getOrder(), c.getOrderBy(), c.getParent(),
@@ -67,7 +65,9 @@ public class WordpressServicePagesAdapter extends AbstractWordpressCrudServiceAd
@Override
public Page retrieve(Integer pageId, Context context, String password) {
LOGGER.debug("Calling retrieve: postId {}; context: {}", pageId, context);
- checkArgument(pageId > 0, "Please provide a non zero post id");
+ if (pageId <= 0) {
+ throw new IllegalArgumentException("Please provide a non zero post id");
+ }
return getSpi().retrieve(this.getApiVersion(), pageId, context, password);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
index 6066df60694..72647c61d28 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServicePostsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.DeletedModel;
@@ -28,9 +29,6 @@ import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-
/**
* The {@link WordpressServicePosts} implementation. Aggregates the {@link PostsSPI} interface using
* {@link JAXRSClientFactory} to make the API calls.
@@ -54,7 +52,7 @@ public class WordpressServicePostsAdapter extends AbstractWordpressCrudServiceAd
@Override
public List<Post> list(PostSearchCriteria criteria) {
LOGGER.debug("Calling list posts: searchCriteria {}", criteria);
- checkNotNull(criteria, "Please provide a search criteria");
+ Objects.requireNonNull(criteria, "Please provide a search criteria");
return getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getAfter(), criteria.getAuthor(),
criteria.getAuthorExclude(), criteria.getBefore(), criteria.getExclude(), criteria.getInclude(),
@@ -66,8 +64,10 @@ public class WordpressServicePostsAdapter extends AbstractWordpressCrudServiceAd
@Override
public Post retrieve(Integer postId, Context context, String password) {
LOGGER.debug("Calling retrievePosts: postId {}; postContext: {}", postId, context);
- checkArgument(postId > 0, "Please provide a non zero post id");
- checkNotNull(context, "Provide a post context");
+ if (postId <= 0) {
+ throw new IllegalArgumentException("Please provide a non zero post id");
+ }
+ Objects.requireNonNull(context, "Provide a post context");
return getSpi().retrieve(this.getApiVersion(), postId, context, password);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
index b190359f1c3..3d338847111 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTagsAdapter.java
@@ -17,6 +17,7 @@
package org.apache.camel.component.wordpress.api.service.impl;
import java.util.List;
+import java.util.Objects;
import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Tag;
@@ -24,8 +25,6 @@ import org.apache.camel.component.wordpress.api.model.TagSearchCriteria;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTags;
import org.apache.camel.component.wordpress.api.service.spi.TagsSPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
public class WordpressServiceTagsAdapter extends AbstractWordpressCrudServiceAdapter<TagsSPI, Tag, TagSearchCriteria>
implements WordpressServiceTags {
@@ -41,7 +40,7 @@ public class WordpressServiceTagsAdapter extends AbstractWordpressCrudServiceAda
// @formatter:off
@Override
public List<Tag> list(TagSearchCriteria criteria) {
- checkNotNull(criteria, "The search criteria must be defined");
+ Objects.requireNonNull(criteria, "The search criteria must be defined");
return this.getSpi().list(this.getApiVersion(), criteria.getContext(), criteria.getPage(), criteria.getPerPage(),
criteria.getSearch(), criteria.getExclude(), criteria.getInclude(),
criteria.getOffset(), criteria.getOrder(), criteria.getOrderBy(), criteria.isHideEmpty(), criteria.getPostId(),
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
index b0a8322e143..f113240e868 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressServiceTaxonomyAdapter.java
@@ -22,9 +22,7 @@ import org.apache.camel.component.wordpress.api.model.Context;
import org.apache.camel.component.wordpress.api.model.Taxonomy;
import org.apache.camel.component.wordpress.api.service.WordpressServiceTaxonomy;
import org.apache.camel.component.wordpress.api.service.spi.TaxonomySPI;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.base.Strings.emptyToNull;
+import org.apache.camel.util.ObjectHelper;
public class WordpressServiceTaxonomyAdapter extends AbstractWordpressServiceAdapter<TaxonomySPI>
implements WordpressServiceTaxonomy {
@@ -45,7 +43,7 @@ public class WordpressServiceTaxonomyAdapter extends AbstractWordpressServiceAda
@Override
public Taxonomy retrieve(Context context, String taxonomy) {
- checkNotNull(emptyToNull(taxonomy), "Please define a taxonomy");
+ ObjectHelper.notNullOrEmpty(taxonomy, "Please define a taxonomy");
return getSpi().retrieve(this.getApiVersion(), context, taxonomy);
}
diff --git a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
index c58b45b653e..22a098d063e 100644
--- a/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
+++ b/components/camel-wordpress/src/main/java/org/apache/camel/component/wordpress/api/service/impl/WordpressSevicePostRevisionAdapter.java
@@ -23,8 +23,6 @@ import org.apache.camel.component.wordpress.api.model.PostRevision;
import org.apache.camel.component.wordpress.api.service.WordpressServicePostRevision;
import org.apache.camel.component.wordpress.api.service.spi.PostRevisionsSPI;
-import static com.google.common.base.Preconditions.checkArgument;
-
public class WordpressSevicePostRevisionAdapter extends AbstractWordpressServiceAdapter<PostRevisionsSPI>
implements WordpressServicePostRevision {
@@ -39,21 +37,31 @@ public class WordpressSevicePostRevisionAdapter extends AbstractWordpressService
@Override
public void delete(Integer postId, Integer revisionId) {
- checkArgument(postId > 0, "Please define a post id");
- checkArgument(revisionId > 0, "Please define a revision id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
+ if (!(revisionId > 0)) {
+ throw new IllegalArgumentException("Please define a revision id");
+ }
this.getSpi().delete(this.getApiVersion(), postId, revisionId);
}
@Override
public PostRevision retrieve(Integer postId, Integer revisionId, Context context) {
- checkArgument(postId > 0, "Please define a post id");
- checkArgument(revisionId > 0, "Please define a revision id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
+ if (!(revisionId > 0)) {
+ throw new IllegalArgumentException("Please define a revision id");
+ }
return this.getSpi().retrieveRevision(this.getApiVersion(), postId, revisionId, context);
}
@Override
public List<PostRevision> list(Integer postId, Context context) {
- checkArgument(postId > 0, "Please define a post id");
+ if (!(postId > 0)) {
+ throw new IllegalArgumentException("Please define a post id");
+ }
return this.getSpi().list(this.getApiVersion(), postId, context);
}