You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juneau.apache.org by gg...@apache.org on 2023/06/24 03:48:59 UTC
[juneau] 23/29: [juneau-rest-server] Remove redundant modifiers
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git
commit 8dd625d8ef9211105c6f27ae710a2291fb5aeae6
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Jun 23 23:37:01 2023 -0400
[juneau-rest-server] Remove redundant modifiers
---
.../main/java/org/apache/juneau/rest/arg/RestOpArg.java | 2 +-
.../org/apache/juneau/rest/converter/RestConverter.java | 2 +-
.../org/apache/juneau/rest/httppart/NamedAttribute.java | 4 ++--
.../org/apache/juneau/rest/httppart/RestPartType.java | 2 +-
.../apache/juneau/rest/processor/ResponseProcessor.java | 6 +++---
.../apache/juneau/rest/servlet/BasicGroupOperations.java | 3 +--
.../apache/juneau/rest/servlet/BasicRestOperations.java | 15 +++++----------
.../org/apache/juneau/rest/staticfile/StaticFiles.java | 4 ++--
.../org/apache/juneau/rest/swagger/SwaggerProvider.java | 4 ++--
.../juneau/rest/util/BoundedServletInputStream.java | 4 ++--
10 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
index 30525a2a5..0a9fe6453 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/arg/RestOpArg.java
@@ -57,5 +57,5 @@ public interface RestOpArg {
* @return The resolved object.
* @throws Exception Generic error occurred.
*/
- public Object resolve(RestOpSession opSession) throws Exception;
+ Object resolve(RestOpSession opSession) throws Exception;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
index 6536f0867..ef2e6da36 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/converter/RestConverter.java
@@ -88,5 +88,5 @@ public interface RestConverter {
* @throws BasicHttpException Thrown if any errors occur during conversion.
* @throws SerializeException Generic serialization error occurred.
*/
- public Object convert(RestRequest req, Object res) throws BasicHttpException, SerializeException;
+ Object convert(RestRequest req, Object res) throws BasicHttpException, SerializeException;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
index d59589d52..beb2a589e 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/NamedAttribute.java
@@ -26,12 +26,12 @@ public interface NamedAttribute {
*
* @return The attribute name.
*/
- public String getName();
+ String getName();
/**
* Returns the attribute value.
*
* @return The attribute value.
*/
- public Object getValue();
+ Object getValue();
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
index 609d30e53..cbd105150 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/httppart/RestPartType.java
@@ -57,7 +57,7 @@ public enum RestPartType {
private final String value;
- private RestPartType(String value) {
+ RestPartType(String value) {
this.value = value;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
index 06ae56b26..22bd2351b 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/processor/ResponseProcessor.java
@@ -82,17 +82,17 @@ public interface ResponseProcessor {
/**
* Return code indicating to proceed to the next response processor in the chain.
*/
- public static final int NEXT = 0;
+ int NEXT = 0;
/**
* Return code indicating that processing is complete and to exit the chain.
*/
- public static final int FINISHED = 1;
+ int FINISHED = 1;
/**
* Return code indicating to restart processing the chain from the beginning.
*/
- public static final int RESTART = 2;
+ int RESTART = 2;
/**
* Process this response if possible.
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
index 4b192fbc0..fd81f3203 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicGroupOperations.java
@@ -51,6 +51,5 @@ public interface BasicGroupOperations {
* @param req The HTTP request.
* @return The bean containing links to the child resources.
*/
- @RestGet(path="/", summary="Navigation page")
- public ChildResourceDescriptions getChildren(RestRequest req);
+ @RestGet(path="/", summary="Navigation page") ChildResourceDescriptions getChildren(RestRequest req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
index c81778082..288cc3d39 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/servlet/BasicRestOperations.java
@@ -114,8 +114,7 @@ public interface BasicRestOperations {
// This is a per-media-type swap that only applies to text/html requests.
SwaggerUI.class
}
- )
- public Swagger getSwagger(RestRequest req);
+ ) Swagger getSwagger(RestRequest req);
/**
* [GET /htdocs/*] - Retrieve static file.
@@ -128,8 +127,7 @@ public interface BasicRestOperations {
path="/htdocs/*",
summary="Static files",
description="Static file retrieval."
- )
- public HttpResource getHtdoc(@Path String path, Locale locale);
+ ) HttpResource getHtdoc(@Path String path, Locale locale);
/**
* [GET favicon.ico] - Retrieve favorites icon image.
@@ -140,8 +138,7 @@ public interface BasicRestOperations {
path="favicon.ico",
summary="Favorites icon.",
description="Favorites icon."
- )
- public HttpResource getFavIcon();
+ ) HttpResource getFavIcon();
/**
* [* /error] - Error occurred.
@@ -156,8 +153,7 @@ public interface BasicRestOperations {
"(such as failed authentication) and will set appropriate response parameters ",
"(such as an WWW-Authenticate response header)."
}
- )
- public void error();
+ ) void error();
/**
* [GET /stats] - Timing statistics.
@@ -183,6 +179,5 @@ public interface BasicRestOperations {
},
// Never show aside contents of page inherited from class.
aside="NONE"
- )
- public RestContextStats getStats(RestRequest req);
+ ) RestContextStats getStats(RestRequest req);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
index 7e2c8d81d..f7ea60136 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/staticfile/StaticFiles.java
@@ -48,7 +48,7 @@ public interface StaticFiles extends FileFinder {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -232,5 +232,5 @@ public interface StaticFiles extends FileFinder {
* @param locale Optional locale.
* @return The resource, or <jk>null</jk> if not found.
*/
- public Optional<HttpResource> resolve(String path, Locale locale);
+ Optional<HttpResource> resolve(String path, Locale locale);
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
index c07fe9c56..2ca738dc1 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/swagger/SwaggerProvider.java
@@ -52,7 +52,7 @@ public interface SwaggerProvider {
* @param beanStore The bean store to use for creating beans.
* @return A new builder for this object.
*/
- public static Builder create(BeanStore beanStore) {
+ static Builder create(BeanStore beanStore) {
return new Builder(beanStore);
}
@@ -224,6 +224,6 @@ public interface SwaggerProvider {
* @return A new {@link Swagger} DTO object.
* @throws Exception If an error occurred producing the Swagger.
*/
- public Swagger getSwagger(RestContext context, Locale locale) throws Exception;
+ Swagger getSwagger(RestContext context, Locale locale) throws Exception;
}
diff --git a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
index f7de326be..89c617594 100644
--- a/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
+++ b/juneau-rest/juneau-rest-server/src/main/java/org/apache/juneau/rest/util/BoundedServletInputStream.java
@@ -62,7 +62,7 @@ public final class BoundedServletInputStream extends ServletInputStream {
}
@Override /* InputStream */
- public final int read() throws IOException {
+ public int read() throws IOException {
decrement();
return is.read();
}
@@ -113,7 +113,7 @@ public final class BoundedServletInputStream extends ServletInputStream {
}
@Override /* InputStream */
- public final void close() throws IOException {
+ public void close() throws IOException {
is.close();
}