xiaoyuyao commented on a change in pull request #1874: URL: https://github.com/apache/ozone/pull/1874#discussion_r568814617
########## File path: hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java ########## @@ -0,0 +1,160 @@ +/* + * 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. + */ + +package org.apache.hadoop.hdds.security.x509.crl; + +import org.apache.hadoop.hdds.protocol.proto.HddsProtos; +import org.apache.hadoop.hdds.security.exception.SCMSecurityException; +import org.apache.hadoop.hdds.security.x509.certificate.utils.CRLCodec; +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.security.cert.CRLException; +import java.security.cert.CertificateException; +import java.security.cert.X509CRL; +import java.util.Comparator; +import java.util.Objects; + +/** + * Class that wraps Certificate Revocation List Info. + */ +public class CRLInfo implements Comparator<CRLInfo>, + Comparable<CRLInfo> { + + private X509CRL x509CRL; + private long creationTimestamp; + + private CRLInfo(X509CRL x509CRL, long creationTimestamp) { + this.x509CRL = x509CRL; + this.creationTimestamp = creationTimestamp; + } + + /** + * Constructor for CRLInfo. Needed for serialization findbugs. + */ + public CRLInfo() { + } + + public static CRLInfo fromProtobuf(HddsProtos.CRLInfoProto info) + throws IOException, CRLException, CertificateException { + CRLInfo.Builder builder = new CRLInfo.Builder(); + return builder + .setX509CRL(CRLCodec.getX509CRL(info.getX509CRL())) + .setCreationTimestamp(info.getCreationTimestamp()) + .build(); + } + + public HddsProtos.CRLInfoProto getProtobuf() throws SCMSecurityException { + HddsProtos.CRLInfoProto.Builder builder = + HddsProtos.CRLInfoProto.newBuilder(); + + return builder.setX509CRL(CRLCodec.getPEMEncodedString(getX509CRL())) + .setCreationTimestamp(getCreationTimestamp()) + .build(); + } + + public X509CRL getX509CRL() { + return x509CRL; + } + + public long getCreationTimestamp() { + return creationTimestamp; + } + + /** + * Compares this object with the specified object for order. Returns a + * negative integer, zero, or a positive integer as this object is less + * than, equal to, or greater than the specified object. + * + * @param o the object to be compared. + * @return a negative integer, zero, or a positive integer as this object + * is less than, equal to, or greater than the specified object. + * @throws NullPointerException if the specified object is null + * @throws ClassCastException if the specified object's type prevents it + * from being compared to this object. + */ + @Override + public int compareTo(@NotNull CRLInfo o) { + return this.compare(this, o); + } + + /** + * Compares its two arguments for order. Returns a negative integer, + * zero, or a positive integer as the first argument is less than, equal + * to, or greater than the second.<p> + * <p> + * + * @param o1 the first object to be compared. + * @param o2 the second object to be compared. + * @return a negative integer, zero, or a positive integer as the + * first argument is less than, equal to, or greater than the + * second. + * @throws NullPointerException if an argument is null and this + * comparator does not permit null arguments + * @throws ClassCastException if the arguments' types prevent them from + * being compared by this comparator. + */ + @Override + public int compare(CRLInfo o1, CRLInfo o2) { + return 0; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + + if (o == null || getClass() != o.getClass()) { + return false; + } + + CRLInfo that = (CRLInfo) o; + + return this.getX509CRL().equals(that.x509CRL) && + this.creationTimestamp == that.creationTimestamp; + } + + @Override + public int hashCode() { + return Objects.hash(x509CRL); + } + Review comment: Can we add a toString override for debugging output, etc? ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
