This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git
The following commit(s) were added to refs/heads/master by this push:
new 7f26047 examples: fix PMD failures
7f26047 is described below
commit 7f26047fce6b232f79b2f53b08295ba65a7f4138
Author: Alexey Markevich <[email protected]>
AuthorDate: Thu Jun 27 01:34:12 2019 +0300
examples: fix PMD failures
---
examples/jaxrsCxfPluginWebapp/pom.xml | 2 +-
.../apache/cxf/fediz/example/FederationService.java | 19 ++++++++-----------
.../apache/cxf/fediz/example/FederationService.java | 14 ++++++--------
examples/jaxrsSpringSecurityWebapp/pom.xml | 2 +-
.../apache/cxf/fediz/example/FederationService.java | 14 +++++++-------
.../cxf/fediz/example/ApplicationContextProvider.java | 4 +---
6 files changed, 24 insertions(+), 31 deletions(-)
diff --git a/examples/jaxrsCxfPluginWebapp/pom.xml
b/examples/jaxrsCxfPluginWebapp/pom.xml
index 90adf2b..f4273d4 100644
--- a/examples/jaxrsCxfPluginWebapp/pom.xml
+++ b/examples/jaxrsCxfPluginWebapp/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.cxf.fediz.examples</groupId>
<artifactId>jaxrsCxfPluginWebapp</artifactId>
- <name>Fediz Example: SpringWebapp</name>
+ <name>Fediz Example: SpringWebapp (CXF Plugin)</name>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git
a/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
b/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
index 01bc608..f5526ef 100644
---
a/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
+++
b/examples/jaxrsCxfPluginWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
@@ -21,8 +21,6 @@ package org.apache.cxf.fediz.example;
import java.io.StringWriter;
import java.security.Principal;
-import java.util.Arrays;
-import java.util.List;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -63,22 +61,22 @@ public class FederationService {
ResponseBuilder rb = Response.ok().type("text/html");
- StringBuilder out = new StringBuilder();
+ StringBuilder out = new StringBuilder(297);
out.append("<html>");
out.append("<head><title>WS Federation Spring Security
Example</title></head>");
out.append("<body>");
out.append("<h1>Hello World</h1>");
out.append("Hello world<br>");
- out.append("Request url: " + uriInfo.getAbsolutePath().toString() +
"<p>");
+ out.append("Request url:
").append(uriInfo.getAbsolutePath()).append("<p>");
out.append("<br><b>User</b><p>");
Principal p = securityContext.getUserPrincipal();
if (p != null) {
- out.append("Principal: " + p.getName() + "<p>");
+ out.append("Principal: ").append(p.getName()).append("<p>");
}
out.append("<br><b>Roles</b><p>");
- List<String> roleListToCheck = Arrays.asList("Admin", "Manager",
"User", "Authenticated");
+ String[] roleListToCheck = new String[]{"Admin", "Manager", "User",
"Authenticated"};
for (String item: roleListToCheck) {
out.append("Has role '" + item + "': "
+ ((securityContext.isUserInRole(item)) ? "<b>yes</b>" : "no")
+ "<p>");
@@ -90,7 +88,7 @@ public class FederationService {
out.append("<br><b>Claims</b><p>");
ClaimCollection claims = fp.getClaims();
for (Claim c: claims) {
- out.append(c.getClaimType().toString() + ": " + c.getValue() +
"<p>");
+ out.append(c.getClaimType()).append(":
").append(c.getValue()).append("<p>");
}
} else {
out.append("Principal is not instance of FedizPrincipal");
@@ -99,19 +97,18 @@ public class FederationService {
Element el = SecurityTokenThreadLocal.getToken();
if (el != null) {
out.append("<p>Bootstrap token...");
- String token = null;
try {
TransformerFactory transFactory =
TransformerFactory.newInstance();
Transformer transformer = transFactory.newTransformer();
StringWriter buffer = new StringWriter();
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION,
"yes");
transformer.transform(new DOMSource(el), new
StreamResult(buffer));
- token = buffer.toString();
+ String token = buffer.toString();
@SuppressWarnings("deprecation")
String escapedXml = StringEscapeUtils.escapeXml(token);
- out.append("<p>" + escapedXml);
+ out.append("<p>").append(escapedXml);
} catch (Exception ex) {
- out.append("<p>Failed to transform cached element to string: "
+ ex.toString());
+ out.append("<p>Failed to transform cached element to string:
").append(ex.toString());
}
} else {
out.append("<p>Bootstrap token not cached in thread local
storage");
diff --git
a/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
b/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
index 5d2dfae..fbc82ad 100644
---
a/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
+++
b/examples/jaxrsSimpleWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
@@ -21,8 +21,6 @@ package org.apache.cxf.fediz.example;
import java.io.StringWriter;
import java.security.Principal;
-import java.util.Arrays;
-import java.util.List;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -56,22 +54,22 @@ public class FederationService {
ResponseBuilder rb = Response.ok().type("text/html");
- StringBuilder out = new StringBuilder();
+ StringBuilder out = new StringBuilder(308);
out.append("<html>");
out.append("<head><title>WS Federation Spring Security
Example</title></head>");
out.append("<body>");
out.append("<h1>Hello World</h1>");
out.append("Hello world<br>");
- out.append("Request url: " + uriInfo.getAbsolutePath().toString() +
"<p>");
+ out.append("Request url:
").append(uriInfo.getAbsolutePath()).append("<p>");
out.append("<br><b>User</b><p>");
Principal p = securityContext.getUserPrincipal();
if (p != null) {
- out.append("Principal: " + p.getName() + "<p>");
+ out.append("Principal: ").append(p.getName()).append("<p>");
}
out.append("<br><b>Roles</b><p>");
- List<String> roleListToCheck = Arrays.asList("Admin", "Manager",
"User", "Authenticated");
+ String[] roleListToCheck = new String[]{"Admin", "Manager", "User",
"Authenticated"};
for (String item: roleListToCheck) {
out.append("Has role '" + item + "': "
+ ((securityContext.isUserInRole(item)) ? "<b>yes</b>" : "no")
+ "<p>");
@@ -102,9 +100,9 @@ public class FederationService {
token = buffer.toString();
@SuppressWarnings("deprecation")
String escapedXml = StringEscapeUtils.escapeXml(token);
- out.append("<p>" + escapedXml);
+ out.append("<p>").append(escapedXml);
} catch (Exception ex) {
- out.append("<p>Failed to transform cached element to string: "
+ ex.toString());
+ out.append("<p>Failed to transform cached element to string:
").append(ex.toString());
}
} else {
out.append("<p>Bootstrap token not cached in thread local
storage");
diff --git a/examples/jaxrsSpringSecurityWebapp/pom.xml
b/examples/jaxrsSpringSecurityWebapp/pom.xml
index b920c24..afba9ee 100644
--- a/examples/jaxrsSpringSecurityWebapp/pom.xml
+++ b/examples/jaxrsSpringSecurityWebapp/pom.xml
@@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.cxf.fediz.examples</groupId>
<artifactId>jaxrsSpringSecurityWebapp</artifactId>
- <name>Fediz Example: SpringWebapp</name>
+ <name>Fediz Example: SpringWebapp (Spring Security)</name>
<packaging>war</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git
a/examples/jaxrsSpringSecurityWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
b/examples/jaxrsSpringSecurityWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
index 401fb01..d29021f 100644
---
a/examples/jaxrsSpringSecurityWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
+++
b/examples/jaxrsSpringSecurityWebapp/src/main/java/org/apache/cxf/fediz/example/FederationService.java
@@ -58,18 +58,18 @@ public class FederationService {
ResponseBuilder rb = Response.ok().type("text/html");
- StringBuilder out = new StringBuilder();
+ StringBuilder out = new StringBuilder(275);
out.append("<html>");
out.append("<head><title>WS Federation Spring Security
Example</title></head>");
out.append("<body>");
out.append("<h1>Hello World</h1>");
out.append("Hello world<br>");
- out.append("Request url: " + uriInfo.getAbsolutePath().toString() +
"<p>");
+ out.append("Request url:
").append(uriInfo.getAbsolutePath()).append("<p>");
out.append("<br><b>User</b><p>");
Principal p = securityContext.getUserPrincipal();
if (p != null) {
- out.append("Principal: " + p.getName() + "<p>");
+ out.append("Principal: ").append(p.getName()).append("<p>");
}
// Access Spring security context
@@ -78,7 +78,7 @@ public class FederationService {
out.append("Roles of user:<p><ul>");
FederationAuthenticationToken fedAuthToken =
(FederationAuthenticationToken) auth;
for (GrantedAuthority item : fedAuthToken.getAuthorities()) {
- out.append("<li>" + item.getAuthority() + "</li>");
+ out.append("<li>").append(item.getAuthority()).append("</li>");
}
out.append("</ul>");
@@ -86,7 +86,7 @@ public class FederationService {
out.append("<br><b>Claims</b><p>");
ClaimCollection claims = ((FederationUser)
fedAuthToken.getUserDetails()).getClaims();
for (Claim c : claims) {
- out.append(c.getClaimType().toString() + ": " +
c.getValue() + "<p>");
+ out.append(c.getClaimType().toString()).append(":
").append(c.getValue()).append("<p>");
}
} else {
out.append("FederationAuthenticationToken found but not
FederationUser");
@@ -109,9 +109,9 @@ public class FederationService {
token = buffer.toString();
@SuppressWarnings("deprecation")
String escapedXml = StringEscapeUtils.escapeXml(token);
- out.append("<p>" + escapedXml);
+ out.append("<p>").append(escapedXml);
} catch (Exception ex) {
- out.append("<p>Failed to transform cached element to string: "
+ ex.toString());
+ out.append("<p>Failed to transform cached element to string:
").append(ex.toString());
}
} else {
out.append("<p>Bootstrap token not cached in thread local
storage");
diff --git
a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ApplicationContextProvider.java
b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ApplicationContextProvider.java
index a10faa2..7bbb7b9 100644
---
a/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ApplicationContextProvider.java
+++
b/examples/wsclientWebapp/webapp/src/main/java/org/apache/cxf/fediz/example/ApplicationContextProvider.java
@@ -19,7 +19,6 @@
package org.apache.cxf.fediz.example;
-import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@@ -37,8 +36,7 @@ public class ApplicationContextProvider implements
ApplicationContextAware {
super();
}
- public void setApplicationContext(ApplicationContext applicationContext)
- throws BeansException {
+ public void setApplicationContext(ApplicationContext applicationContext) {
ApplicationContextProvider.ctx = applicationContext;
}
