src/share/classes/org/jcp/xml/dsig/internal/dom/DOMSignatureProperty.java
Print this page
*** 1,38 ****
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
! /*
! * Copyright 2005 The Apache Software Foundation.
! *
! * Licensed under the Apache License, Version 2.0 (the "License");
! * you may not use this file except in compliance with the License.
! * You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing, software
! * distributed under the License is distributed on an "AS IS" BASIS,
! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
! * See the License for the specific language governing permissions and
! * limitations under the License.
! *
*/
/*
* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
*/
/*
! * $Id: DOMSignatureProperty.java,v 1.2 2008/07/24 15:20:32 mullan Exp $
*/
package org.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.util.*;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
--- 1,41 ----
/*
* reserved comment block
* DO NOT REMOVE OR ALTER!
*/
! /**
! * Licensed to the Apache Software Foundation (ASF) under one
! * or more contributor license agreements. See the NOTICE file
! * distributed with this work for additional information
! * regarding copyright ownership. The ASF licenses this file
! * to you under the Apache License, Version 2.0 (the
! * "License"); you may not use this file except in compliance
! * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
! * Unless required by applicable law or agreed to in writing,
! * software distributed under the License is distributed on an
! * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
! * KIND, either express or implied. See the License for the
! * specific language governing permissions and limitations
! * under the License.
*/
/*
* Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
*/
/*
! * $Id: DOMSignatureProperty.java 1333415 2012-05-03 12:03:51Z coheigea $
*/
package org.jcp.xml.dsig.internal.dom;
import javax.xml.crypto.*;
import javax.xml.crypto.dom.DOMCryptoContext;
import javax.xml.crypto.dsig.*;
import java.util.*;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
*** 45,55 ****
public final class DOMSignatureProperty extends DOMStructure
implements SignatureProperty {
private final String id;
private final String target;
! private final List content;
/**
* Creates a <code>SignatureProperty</code> from the specified parameters.
*
* @param content a list of one or more {@link XMLStructure}s. The list
--- 48,58 ----
public final class DOMSignatureProperty extends DOMStructure
implements SignatureProperty {
private final String id;
private final String target;
! private final List<XMLStructure> content;
/**
* Creates a <code>SignatureProperty</code> from the specified parameters.
*
* @param content a list of one or more {@link XMLStructure}s. The list
*** 61,97 ****
* entries that are not of type {@link XMLStructure}
* @throws IllegalArgumentException if <code>content</code> is empty
* @throws NullPointerException if <code>content</code> or
* <code>target</code> is <code>null</code>
*/
! public DOMSignatureProperty(List content, String target, String id) {
if (target == null) {
throw new NullPointerException("target cannot be null");
} else if (content == null) {
throw new NullPointerException("content cannot be null");
} else if (content.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
} else {
! List contentCopy = new ArrayList(content);
! for (int i = 0, size = contentCopy.size(); i < size; i++) {
! if (!(contentCopy.get(i) instanceof XMLStructure)) {
throw new ClassCastException
("content["+i+"] is not a valid type");
}
}
- this.content = Collections.unmodifiableList(contentCopy);
}
this.target = target;
this.id = id;
}
/**
* Creates a <code>DOMSignatureProperty</code> from an element.
*
* @param propElem a SignatureProperty element
*/
! public DOMSignatureProperty(Element propElem) throws MarshalException {
// unmarshal attributes
target = DOMUtils.getAttributeValue(propElem, "Target");
if (target == null) {
throw new MarshalException("target cannot be null");
}
--- 64,104 ----
* entries that are not of type {@link XMLStructure}
* @throws IllegalArgumentException if <code>content</code> is empty
* @throws NullPointerException if <code>content</code> or
* <code>target</code> is <code>null</code>
*/
! public DOMSignatureProperty(List<? extends XMLStructure> content,
! String target, String id)
! {
if (target == null) {
throw new NullPointerException("target cannot be null");
} else if (content == null) {
throw new NullPointerException("content cannot be null");
} else if (content.isEmpty()) {
throw new IllegalArgumentException("content cannot be empty");
} else {
! this.content = Collections.unmodifiableList(
! new ArrayList<XMLStructure>(content));
! for (int i = 0, size = this.content.size(); i < size; i++) {
! if (!(this.content.get(i) instanceof XMLStructure)) {
throw new ClassCastException
("content["+i+"] is not a valid type");
}
}
}
this.target = target;
this.id = id;
}
/**
* Creates a <code>DOMSignatureProperty</code> from an element.
*
* @param propElem a SignatureProperty element
*/
! public DOMSignatureProperty(Element propElem, XMLCryptoContext context)
! throws MarshalException
! {
// unmarshal attributes
target = DOMUtils.getAttributeValue(propElem, "Target");
if (target == null) {
throw new MarshalException("target cannot be null");
}
*** 103,113 ****
id = null;
}
NodeList nodes = propElem.getChildNodes();
int length = nodes.getLength();
! List content = new ArrayList(length);
for (int i = 0; i < length; i++) {
content.add(new javax.xml.crypto.dom.DOMStructure(nodes.item(i)));
}
if (content.isEmpty()) {
throw new MarshalException("content cannot be empty");
--- 110,120 ----
id = null;
}
NodeList nodes = propElem.getChildNodes();
int length = nodes.getLength();
! List<XMLStructure> content = new ArrayList<XMLStructure>(length);
for (int i = 0; i < length; i++) {
content.add(new javax.xml.crypto.dom.DOMStructure(nodes.item(i)));
}
if (content.isEmpty()) {
throw new MarshalException("content cannot be empty");
*** 127,189 ****
public String getTarget() {
return target;
}
public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
! throws MarshalException {
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
!
! Element propElem = DOMUtils.createElement
! (ownerDoc, "SignatureProperty", XMLSignature.XMLNS, dsPrefix);
// set attributes
DOMUtils.setAttributeID(propElem, "Id", id);
DOMUtils.setAttribute(propElem, "Target", target);
// create and append any elements and mixed content
! for (int i = 0, size = content.size(); i < size; i++) {
! javax.xml.crypto.dom.DOMStructure property =
! (javax.xml.crypto.dom.DOMStructure) content.get(i);
! DOMUtils.appendChild(propElem, property.getNode());
}
parent.appendChild(propElem);
}
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof SignatureProperty)) {
return false;
}
! SignatureProperty osp = (SignatureProperty) o;
! boolean idsEqual = (id == null ? osp.getId() == null :
! id.equals(osp.getId()));
! return (equalsContent(osp.getContent()) &&
target.equals(osp.getTarget()) && idsEqual);
}
! private boolean equalsContent(List otherContent) {
int osize = otherContent.size();
if (content.size() != osize) {
return false;
}
for (int i = 0; i < osize; i++) {
! XMLStructure oxs = (XMLStructure) otherContent.get(i);
! XMLStructure xs = (XMLStructure) content.get(i);
if (oxs instanceof javax.xml.crypto.dom.DOMStructure) {
if (!(xs instanceof javax.xml.crypto.dom.DOMStructure)) {
return false;
}
! Node onode =
! ((javax.xml.crypto.dom.DOMStructure) oxs).getNode();
! Node node =
! ((javax.xml.crypto.dom.DOMStructure) xs).getNode();
if (!DOMUtils.nodesEqual(node, onode)) {
return false;
}
} else {
if (!(xs.equals(oxs))) {
--- 134,208 ----
public String getTarget() {
return target;
}
public void marshal(Node parent, String dsPrefix, DOMCryptoContext context)
! throws MarshalException
! {
Document ownerDoc = DOMUtils.getOwnerDocument(parent);
! Element propElem = DOMUtils.createElement(ownerDoc, "SignatureProperty",
! XMLSignature.XMLNS, dsPrefix);
// set attributes
DOMUtils.setAttributeID(propElem, "Id", id);
DOMUtils.setAttribute(propElem, "Target", target);
// create and append any elements and mixed content
! for (XMLStructure property : content) {
! DOMUtils.appendChild(propElem,
! ((javax.xml.crypto.dom.DOMStructure)property).getNode());
}
parent.appendChild(propElem);
}
+ @Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof SignatureProperty)) {
return false;
}
! SignatureProperty osp = (SignatureProperty)o;
! boolean idsEqual = (id == null ? osp.getId() == null
! : id.equals(osp.getId()));
! @SuppressWarnings("unchecked")
! List<XMLStructure> ospContent = osp.getContent();
! return (equalsContent(ospContent) &&
target.equals(osp.getTarget()) && idsEqual);
}
! @Override
! public int hashCode() {
! int result = 17;
! if (id != null) {
! result = 31 * result + id.hashCode();
! }
! result = 31 * result + target.hashCode();
! result = 31 * result + content.hashCode();
!
! return result;
! }
!
! private boolean equalsContent(List<XMLStructure> otherContent) {
int osize = otherContent.size();
if (content.size() != osize) {
return false;
}
for (int i = 0; i < osize; i++) {
! XMLStructure oxs = otherContent.get(i);
! XMLStructure xs = content.get(i);
if (oxs instanceof javax.xml.crypto.dom.DOMStructure) {
if (!(xs instanceof javax.xml.crypto.dom.DOMStructure)) {
return false;
}
! Node onode = ((javax.xml.crypto.dom.DOMStructure)oxs).getNode();
! Node node = ((javax.xml.crypto.dom.DOMStructure)xs).getNode();
if (!DOMUtils.nodesEqual(node, onode)) {
return false;
}
} else {
if (!(xs.equals(oxs))) {