[idwsfconsumer] branch master updated: IDP-1397: Removal of deprecated features
Brent Putman
putmanb at georgetown.edu
Wed Feb 19 20:02:01 EST 2020
This is an automated email from the git hooks/post-receive script.
putmanb pushed a commit to branch master
in repository idwsfconsumer.
View the commit online:
http://git.shibboleth.net/view/?p=idwsfconsumer.git;a=commit;h=f886638a64f507130a69f57b031a44471d42ce21
The following commit(s) were added to refs/heads/master by this push:
new f886638 IDP-1397: Removal of deprecated features
f886638 is described below
commit f886638a64f507130a69f57b031a44471d42ce21
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Wed Feb 19 20:01:45 2020 -0500
IDP-1397: Removal of deprecated features
---
src/main/java/org/openliberty/wsc/PeopleService.java | 10 +++++-----
src/main/java/org/openliberty/wsc/SSLUtilities.java | 9 ++++++---
src/main/java/org/openliberty/wsc/WSFMessageSigner.java | 3 ++-
.../org/openliberty/xmltooling/pp/dst2_1/ct/MsgMethod.java | 6 +++---
src/main/java/org/openliberty/xmltooling/ps/ObjectID.java | 2 +-
src/main/java/org/openliberty/xmltooling/ps/PSObject.java | 10 +++++-----
.../java/org/openliberty/xmltooling/ps/TargetObjectID.java | 2 +-
7 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/openliberty/wsc/PeopleService.java b/src/main/java/org/openliberty/wsc/PeopleService.java
index 1d63baf..778ad5e 100644
--- a/src/main/java/org/openliberty/wsc/PeopleService.java
+++ b/src/main/java/org/openliberty/wsc/PeopleService.java
@@ -715,8 +715,8 @@ public class PeopleService extends BaseServiceClient
ListMembersRequest request = new ListMembersRequest();
request.setStructured(structure.name());
- request.setCount(new Integer(count));
- request.setOffset(new Integer(offset));
+ request.setCount(Integer.valueOf(count));
+ request.setOffset(Integer.valueOf(offset));
if(null!=collectionID)
{
@@ -776,7 +776,7 @@ public class PeopleService extends BaseServiceClient
// make sure that the targetObjectId has been specified
if(null!=targetObjectID)
{
- String id = targetObjectID.getValue();
+ String id = targetObjectID.getURI();
if(null==id || id.length()==0)
{
if(log.isDebugEnabled()) log.debug("targetObjectID is required for A GetObjectInfo request");
@@ -886,10 +886,10 @@ public class PeopleService extends BaseServiceClient
}
if(count<0) count = 0;
- request.setCount(new Integer(count));
+ request.setCount(Integer.valueOf(count));
if(offset<0) offset = 0;
- request.setOffset(new Integer(offset));
+ request.setOffset(Integer.valueOf(offset));
QueryObjectsResponse response = (QueryObjectsResponse)invoke(request);
diff --git a/src/main/java/org/openliberty/wsc/SSLUtilities.java b/src/main/java/org/openliberty/wsc/SSLUtilities.java
index b4c2383..b8b40bc 100755
--- a/src/main/java/org/openliberty/wsc/SSLUtilities.java
+++ b/src/main/java/org/openliberty/wsc/SSLUtilities.java
@@ -13,6 +13,7 @@ import java.io.Writer;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
@@ -37,6 +38,8 @@ import org.openliberty.LibConstants;
import org.openliberty.LibUtils;
import org.w3c.dom.Element;
+import com.google.common.io.Closeables;
+
/**
* This class contains a group of utilities used by the ClientLib
* to make SSl/TLS and Mutual SSL/TLS requests.
@@ -139,7 +142,7 @@ public class SSLUtilities
wout.close();
InputStream in = connection.getInputStream();
- String response = IOUtils.toString(in);
+ String response = IOUtils.toString(in, StandardCharsets.UTF_8);
return response;
}
catch (IOException e)
@@ -309,7 +312,7 @@ public class SSLUtilities
if(null!=is)
{
- String response = IOUtils.toString(is);
+ String response = IOUtils.toString(is, StandardCharsets.UTF_8);
if(LibConstants.USE_AXIS_1_3_GREGORIAN_CALENDAR_SERIALIZATION_BUG_WORKAROUND)
{
@@ -317,7 +320,7 @@ public class SSLUtilities
}
s.close();
- IOUtils.closeQuietly(is);
+ Closeables.closeQuietly(is);
if(isDebugEnabled)
{
log.debug("input stream closed");
diff --git a/src/main/java/org/openliberty/wsc/WSFMessageSigner.java b/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
index df5b570..bc2d751 100644
--- a/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
+++ b/src/main/java/org/openliberty/wsc/WSFMessageSigner.java
@@ -101,7 +101,8 @@ public class WSFMessageSigner
// First, create a DOM XMLSignatureFactory that will be used to
// generate the XMLSignature and marshal it to DOM.
String providerName = System.getProperty("jsr105Provider", "org.jcp.xml.dsig.internal.dom.XMLDSigRI");
- XMLSignatureFactory xmlSignatureFactory = XMLSignatureFactory.getInstance("DOM", (Provider) Class.forName(providerName).newInstance());
+ XMLSignatureFactory xmlSignatureFactory = XMLSignatureFactory.getInstance("DOM",
+ (Provider) Class.forName(providerName).getDeclaredConstructor().newInstance());
// Create a Reference to an external URI that will be digested
// using the SHA1 digest algorithm
diff --git a/src/main/java/org/openliberty/xmltooling/pp/dst2_1/ct/MsgMethod.java b/src/main/java/org/openliberty/xmltooling/pp/dst2_1/ct/MsgMethod.java
index e5262ff..8f2da97 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/dst2_1/ct/MsgMethod.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/dst2_1/ct/MsgMethod.java
@@ -34,18 +34,18 @@ public class MsgMethod extends DSTURI
public Method getMethod()
{
- return Method.getMethodForUri(getValue());
+ return Method.getMethodForUri(getURI());
}
public void setMethod(Method method)
{
if(null!=method)
{
- setValue(method.uri());
+ setURI(method.uri());
}
else
{
- setValue("");
+ setURI("");
}
}
diff --git a/src/main/java/org/openliberty/xmltooling/ps/ObjectID.java b/src/main/java/org/openliberty/xmltooling/ps/ObjectID.java
index 2513e0b..2494913 100644
--- a/src/main/java/org/openliberty/xmltooling/ps/ObjectID.java
+++ b/src/main/java/org/openliberty/xmltooling/ps/ObjectID.java
@@ -42,7 +42,7 @@ public class ObjectID extends XSURIImpl
public ObjectID(String value)
{
super(Konstantz.PS_NS, LOCAL_NAME, Konstantz.PS_PREFIX);
- this.setValue(value);
+ this.setURI(value);
}
protected ObjectID(String namespaceURI, String elementLocalName, String namespacePrefix)
diff --git a/src/main/java/org/openliberty/xmltooling/ps/PSObject.java b/src/main/java/org/openliberty/xmltooling/ps/PSObject.java
index 2b5cc7c..11af130 100644
--- a/src/main/java/org/openliberty/xmltooling/ps/PSObject.java
+++ b/src/main/java/org/openliberty/xmltooling/ps/PSObject.java
@@ -163,7 +163,7 @@ public class PSObject extends AbstractXMLObject implements ElementExtensibleXMLO
System.err.print("\t");
}
- System.err.print(object.getNodeType().urn()+": "+object.getName()+" / "+object.getObjectID().getValue());
+ System.err.print(object.getNodeType().urn()+": "+object.getName()+" / "+object.getObjectID().getURI());
List<Tag> tags = object.getTags();
if(null!=tags && tags.size()>0)
{
@@ -201,10 +201,10 @@ public class PSObject extends AbstractXMLObject implements ElementExtensibleXMLO
ObjectRef objectRef = null;
ObjectID objectId = this.getObjectID();
- if(objectId!=null && objectId.getValue()!=null)
+ if(objectId!=null && objectId.getURI()!=null)
{
objectRef = new ObjectRef();
- objectRef.setValue(objectId.getValue());
+ objectRef.setValue(objectId.getURI());
}
return objectRef;
@@ -220,11 +220,11 @@ public class PSObject extends AbstractXMLObject implements ElementExtensibleXMLO
TargetObjectID targetObjectID = null;
ObjectID objectId = this.getObjectID();
- if(objectId!=null && objectId.getValue()!=null)
+ if(objectId!=null && objectId.getURI()!=null)
{
targetObjectID = new TargetObjectID();
- targetObjectID.setValue(objectId.getValue());
+ targetObjectID.setURI(objectId.getURI());
}
return targetObjectID;
diff --git a/src/main/java/org/openliberty/xmltooling/ps/TargetObjectID.java b/src/main/java/org/openliberty/xmltooling/ps/TargetObjectID.java
index 3e5e535..ee379c3 100644
--- a/src/main/java/org/openliberty/xmltooling/ps/TargetObjectID.java
+++ b/src/main/java/org/openliberty/xmltooling/ps/TargetObjectID.java
@@ -24,7 +24,7 @@ public class TargetObjectID extends XSURIImpl
public TargetObjectID(String value)
{
super(Konstantz.PS_NS, LOCAL_NAME, Konstantz.PS_PREFIX);
- this.setValue(value);
+ this.setURI(value);
}
protected TargetObjectID(String namespaceURI, String elementLocalName, String namespacePrefix)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list