You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2016/04/18 14:16:18 UTC
svn commit: r1739751 - in /qpid/java/trunk:
broker-codegen/src/main/java/org/apache/qpid/server/model/validation/
broker-core/src/main/java/org/apache/qpid/server/model/
broker-core/src/main/java/org/apache/qpid/server/security/
Author: kwall
Date: Mon Apr 18 12:16:18 2016
New Revision: 1739751
URL: http://svn.apache.org/viewvc?rev=1739751&view=rev
Log:
QPID-7158: [Java Broker] Address review comments from orudyy@apache.org
Modified:
qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
Modified: qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java (original)
+++ qpid/java/trunk/broker-codegen/src/main/java/org/apache/qpid/server/model/validation/AttributeAnnotationValidator.java Mon Apr 18 12:16:18 2016
@@ -394,11 +394,6 @@ public class AttributeAnnotationValidato
return true;
}
- if(typeUtils.isSameType(type,elementUtils.getTypeElement("java.util.Date").asType()))
- {
- return true;
- }
-
if(typeUtils.isSameType(type,elementUtils.getTypeElement("java.security.cert.Certificate").asType()))
{
return true;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Mon Apr 18 12:16:18 2016
@@ -180,7 +180,7 @@ public abstract class AbstractConfigured
private boolean _openComplete;
private boolean _openFailed;
private volatile State _state = State.UNINITIALIZED;
- private volatile long _lastOpenedTime;
+ private volatile Date _lastOpenedTime;
protected static Map<Class<? extends ConfiguredObject>, ConfiguredObject<?>> parentsMap(ConfiguredObject<?>... parents)
{
@@ -988,7 +988,7 @@ public abstract class AbstractConfigured
}
});
_openComplete = true;
- _lastOpenedTime = System.currentTimeMillis();
+ _lastOpenedTime = new Date();
}
}
@@ -2794,7 +2794,7 @@ public abstract class AbstractConfigured
}
@Override
- public final long getLastOpenedTime()
+ public final Date getLastOpenedTime()
{
return _lastOpenedTime;
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/ConfiguredObject.java Mon Apr 18 12:16:18 2016
@@ -127,7 +127,7 @@ public interface ConfiguredObject<X exte
State getState();
@DerivedAttribute
- long getLastOpenedTime();
+ Date getLastOpenedTime();
/**
* Add a listener which will be informed of all changes to this configuration object
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/CertificateDetails.java Mon Apr 18 12:16:18 2016
@@ -35,7 +35,7 @@ public interface CertificateDetails exte
String getIssuerName();
String getSubjectName();
List<String> getSubjectAltNames();
- long getValidFrom();
- long getValidUntil();
+ Date getValidFrom();
+ Date getValidUntil();
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/ManagedPeerCertificateTrustStoreImpl.java Mon Apr 18 12:16:18 2016
@@ -26,19 +26,16 @@ import java.security.GeneralSecurityExce
import java.security.cert.Certificate;
import java.security.cert.CertificateParsingException;
import java.security.cert.X509Certificate;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.GregorianCalendar;
+import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.TimeZone;
import java.util.concurrent.Callable;
import javax.net.ssl.TrustManager;
@@ -461,7 +458,7 @@ public class ManagedPeerCertificateTrust
}
@Override
- public List<String> getSubjectAltNames()
+ public List<String> AttrgetSubjectAltNames()
{
try
{
@@ -489,15 +486,15 @@ public class ManagedPeerCertificateTrust
}
@Override
- public long getValidFrom()
+ public Date getValidFrom()
{
- return _x509cert.getNotBefore().getTime();
+ return _x509cert.getNotBefore();
}
@Override
- public long getValidUntil()
+ public Date getValidUntil()
{
- return _x509cert.getNotAfter().getTime();
+ return _x509cert.getNotAfter();
}
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1739751&r1=1739750&r2=1739751&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java Mon Apr 18 12:16:18 2016
@@ -152,13 +152,13 @@ public class NonJavaKeyStoreImpl extends
@Override
public Date getCertificateValidEnd()
{
- return _certificate == null ? new Date(0) : _certificate.getNotAfter();
+ return _certificate == null ? null : _certificate.getNotAfter();
}
@Override
public Date getCertificateValidStart()
{
- return _certificate == null ? new Date(0) : _certificate.getNotBefore();
+ return _certificate == null ? null : _certificate.getNotBefore();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org