From e771ea26838a58ae79e71a9a522538d8d27e863f Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 06 Jan 2016 11:20:30 +0000
Subject: [PATCH] Added @Override annotations, removed {@inheritDoc}
---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
old mode 100755
new mode 100644
index 132124f..b2d3cf3
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java
@@ -23,7 +23,7 @@
*
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2009 Parametric Technology Corporation (PTC)
- * Portions copyright 2014 ForgeRock AS
+ * Portions copyright 2014-2016 ForgeRock AS
*/
package com.forgerock.opendj.cli;
@@ -160,6 +160,7 @@
* @return the alias name for the desired key, or null if there are no
* matches.
*/
+ @Override
public String chooseClientAlias(final String[] keyType, final Principal[] issuers,
final Socket socket) {
if (keyManager != null) {
@@ -186,6 +187,7 @@
* @return the alias name for the desired key, or null if there are no
* matches.
*/
+ @Override
public String chooseServerAlias(final String keyType, final Principal[] issuers, final Socket socket) {
if (keyManager != null) {
return keyManager.chooseServerAlias(keyType, issuers, socket);
@@ -202,6 +204,7 @@
* and the root certificate authority last), or null if the alias
* can't be found.
*/
+ @Override
public X509Certificate[] getCertificateChain(final String alias) {
if (keyManager != null) {
return keyManager.getCertificateChain(alias);
@@ -222,6 +225,7 @@
* @return an array of the matching alias names, or null if there were no
* matches.
*/
+ @Override
public String[] getClientAliases(final String keyType, final Principal[] issuers) {
if (keyManager != null) {
return keyManager.getClientAliases(keyType, issuers);
@@ -236,6 +240,7 @@
* the alias name
* @return the requested key, or null if the alias can't be found.
*/
+ @Override
public PrivateKey getPrivateKey(final String alias) {
if (keyManager != null) {
return keyManager.getPrivateKey(alias);
@@ -256,6 +261,7 @@
* @return an array of the matching alias names, or null if there were no
* matches.
*/
+ @Override
public String[] getServerAliases(final String keyType, final Principal[] issuers) {
if (keyManager != null) {
return keyManager.getServerAliases(keyType, issuers);
--
Gitblit v1.10.0