Skip to content

Add missing @Override annotations flagged by CodeQL #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vharseko wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add missing @Override annotations flagged by CodeQL #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...F-csvfile-connector/src/main/java/org/forgerock/openicf/csvfile/CSVFileConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* own identifying information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2015-2016 ForgeRock AS.
* Portions Copyright 2026 3A Systems, LLC.
*/
package org.forgerock.openicf.csvfile;

Expand Down Expand Up @@ -142,6 +143,7 @@ public void setSyncFileRetentionCount(int syncFileRetentionCount) {
/**
* {@inheritDoc}
*/
@Override
public void validate() {
log.ok("begin");

Expand Down
27 changes: 27 additions & 0 deletions OpenICF-csvfile-connector/src/main/java/org/forgerock/openicf/csvfile/CSVFileConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* Copyright 2015-2016 ForgeRock AS
* Portions Copyright 2011 Viliam Repan
* Portions Copyright 2011 Radovan Semancik
* Portions Copyrighted 2026 3A Systems, LLC
*/
package org.forgerock.openicf.csvfile;

Expand Down Expand Up @@ -177,6 +178,7 @@ public class CSVFileConnector implements Connector, BatchOp, AuthenticateOp, Cre
*
* @return The current {@link Configuration}
*/
@Override
public Configuration getConfiguration() {
return this.config;
}
Expand All @@ -188,6 +190,7 @@ public Configuration getConfiguration() {
* the new {@link Configuration}
* @see org.identityconnectors.framework.spi.Connector#init(org.identityconnectors.framework.spi.Configuration)
*/
@Override
public void init(final Configuration config) {
this.config = (CSVFileConfiguration) config;
csvPreference = new CsvPreference.Builder(
Expand Down Expand Up @@ -229,6 +232,7 @@ public void init(final Configuration config) {
*
* @see org.identityconnectors.framework.spi.Connector#dispose()
*/
@Override
public void dispose() {
config = null;
}
Expand All @@ -243,6 +247,7 @@ public void dispose() {
/**
* {@inheritDoc}
*/
@Override
public Uid authenticate(final ObjectClass objectClass, final String userName, final GuardedString password,
final OperationOptions options) {
isAccount(objectClass);
Expand All @@ -255,6 +260,7 @@ public Uid authenticate(final ObjectClass objectClass, final String userName, fi
/**
* {@inheritDoc}
*/
@Override
public Uid resolveUsername(final ObjectClass objectClass, final String userName, final OperationOptions options) {
isAccount(objectClass);
return testCredentials(userName, null, options);
Expand All @@ -274,6 +280,7 @@ private Uid testCredentials(String name, GuardedString password, OperationOption
/**
* {@inheritDoc}
*/
@Override
public Uid create(final ObjectClass objectClass, final Set<Attribute> createAttributes,
final OperationOptions options) {
isAccount(objectClass);
Expand All @@ -283,6 +290,7 @@ public Uid create(final ObjectClass objectClass, final Set<Attribute> createAttr
/**
* {@inheritDoc}
*/
@Override
public void delete(final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
isAccount(objectClass);
doDelete(uid, options);
Expand All @@ -291,6 +299,7 @@ public void delete(final ObjectClass objectClass, final Uid uid, final Operation
/**
* {@inheritDoc}
*/
@Override
public Schema schema() {
final String[] header = getHeader();
ObjectClassInfoBuilder objClassBuilder = new ObjectClassInfoBuilder();
Expand Down Expand Up @@ -320,6 +329,7 @@ public Schema schema() {
/**
* {@inheritDoc}
*/
@Override
public FilterTranslator<Filter> createFilterTranslator(ObjectClass objectClass, OperationOptions options) {
isAccount(objectClass);
return CSVFilterTranslator.INSTANCE;
Expand All @@ -328,6 +338,7 @@ public FilterTranslator<Filter> createFilterTranslator(ObjectClass objectClass,
/**
* {@inheritDoc}
*/
@Override
public void executeQuery(ObjectClass objectClass, Filter query, ResultsHandler handler, OperationOptions options) {
isAccount(objectClass);
if (handler == null) {
Expand Down Expand Up @@ -430,6 +441,7 @@ public void executeQuery(ObjectClass objectClass, Filter query, ResultsHandler h
/**
* {@inheritDoc}
*/
@Override
public void sync(ObjectClass objectClass, SyncToken token, SyncResultsHandler handler, OperationOptions options) {
isAccount(objectClass);
if (handler == null) {
Expand Down Expand Up @@ -569,6 +581,7 @@ public void sync(ObjectClass objectClass, SyncToken token, SyncResultsHandler ha
/**
* {@inheritDoc}
*/
@Override
public SyncToken getLatestSyncToken(ObjectClass objectClass) {
isAccount(objectClass);

Expand Down Expand Up @@ -599,6 +612,7 @@ public SyncToken getLatestSyncToken(ObjectClass objectClass) {
/**
* {@inheritDoc}
*/
@Override
public void test() {
config.validate();

Expand All @@ -611,6 +625,7 @@ public void test() {
/**
* {@inheritDoc}
*/
@Override
public Uid update(ObjectClass objectClass, Uid uid, Set<Attribute> attributes, OperationOptions options) {
isAccount(objectClass);
return doUpdate(UpdateType.UPDATE, uid, attributes, options);
Expand All @@ -619,6 +634,7 @@ public Uid update(ObjectClass objectClass, Uid uid, Set<Attribute> attributes, O
/**
* {@inheritDoc}
*/
@Override
public Uid addAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> attributes,
OperationOptions options) {
isAccount(objectClass);
Expand All @@ -628,6 +644,7 @@ public Uid addAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> a
/**
* {@inheritDoc}
*/
@Override
public Uid removeAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> attributes,
OperationOptions options) {
isAccount(objectClass);
Expand All @@ -637,6 +654,7 @@ public Uid removeAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute
/**
* {@inheritDoc}
*/
@Override
public Subscription executeBatch(List<BatchTask> batchTasks, Observer<BatchResult> observer,
OperationOptions operationOptions) {
if (observer == null) {
Expand All @@ -655,28 +673,34 @@ public Subscription executeBatch(List<BatchTask> batchTasks, Observer<BatchResul
}
observer.onCompleted();
return new Subscription() {
@Override
public void close() {}

@Override
public boolean isUnsubscribed() {
return true;
}

@Override
public Object getReturnValue() {
return null;
}
};
}

private class BatchTaskExecutorImpl implements BatchTaskExecutor {
@Override
public Uid execute(CreateBatchTask task) {
return doCreate(task.getCreateAttributes(), task.getOptions());
}

@Override
public BatchEmptyResult execute(DeleteBatchTask task) {
doDelete(task.getUid(), task.getOptions());
return null;
}

@Override
public Uid execute(UpdateBatchTask task) {
return doUpdate(task.getUpdateType(), task.getUid(), task.getAttributes(), task.getOptions());
}
Expand All @@ -685,6 +709,7 @@ public Uid execute(UpdateBatchTask task) {
/**
* {@inheritDoc}
*/
@Override
public Subscription queryBatch(BatchToken batchToken, Observer<BatchResult> observer,
OperationOptions operationOptions) {
return null;
Expand Down Expand Up @@ -730,6 +755,7 @@ private Uid findAccount(final Uid uid, final GuardedString password,
}
final Map<String, Object> finalEntry = entry;
password.access(new GuardedString.Accessor() {
@Override
public void access(char[] chars) {
if (!new String(chars).equals(finalEntry.get(config.getHeaderPassword()))) {
throw new InvalidPasswordException("Invalid username and/or password.");
Expand Down Expand Up @@ -1216,6 +1242,7 @@ public OptionalTrim(final StringCellProcessor next) {
/**
* {@inheritDoc}
*/
@Override
public Object execute(final Object value, final CsvContext context) {
Object result = value;
if (value != null) {
Expand Down
15 changes: 15 additions & 0 deletions ...-connector/src/main/java/org/identityconnectors/databasetable/DatabaseTableConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ public class DatabaseTableConnector implements PoolableConnector, CreateOp, Sear
/**
* {@inheritDoc}
*/
@Override
public Configuration getConfiguration() {
return this.config;
}
Expand All @@ -183,6 +184,7 @@ public Configuration getConfiguration() {
* Init the connector
* {@inheritDoc}
*/
@Override
public void init(Configuration cfg) {
log.info("init DatabaseTable connector");
this.config = (DatabaseTableConfiguration) cfg;
Expand All @@ -195,6 +197,7 @@ public void init(Configuration cfg) {
/**
* {@inheritDoc}
*/
@Override
public void checkAlive() {
log.info("checkAlive DatabaseTable connector");
try {
Expand Down Expand Up @@ -230,6 +233,7 @@ DatabaseTableConnection getConn() {
* Disposes of the {@link DatabaseTableConnector}'s resources.
* {@inheritDoc}
*/
@Override
public void dispose() {
log.info("dispose DatabaseTable connector");
if ( conn != null ) {
Expand All @@ -245,6 +249,7 @@ public void dispose() {
* Creates a row in the database representing an account.
* {@inheritDoc}
*/
@Override
public Uid create(ObjectClass oclass, Set<Attribute> attrs, OperationOptions options) {
log.info("create account, check the ObjectClass");
if(oclass == null || (!oclass.equals(ObjectClass.ACCOUNT))) {
Expand Down Expand Up @@ -355,6 +360,7 @@ private boolean isToBeEmpty(final String columnName, Object value) {
* Deletes a row from the table.
* {@inheritDoc}
*/
@Override
public void delete(final ObjectClass oclass, final Uid uid, final OperationOptions options) {
log.info("delete account, check the ObjectClass");

Expand Down Expand Up @@ -414,6 +420,7 @@ public void delete(final ObjectClass oclass, final Uid uid, final OperationOptio
* Update the database row with the data provided.
* {@inheritDoc}
*/
@Override
public Uid update(ObjectClass oclass, Uid uid, Set<Attribute> attrs, OperationOptions options) {
log.info("update account, check the ObjectClass");

Expand Down Expand Up @@ -501,6 +508,7 @@ public Uid update(ObjectClass oclass, Uid uid, Set<Attribute> attrs, OperationOp
* Creates a Database Table filter translator.
* {@inheritDoc}
*/
@Override
public FilterTranslator<FilterWhereBuilder> createFilterTranslator(ObjectClass oclass, OperationOptions options) {
log.info("check the ObjectClass");
if(oclass == null || (!oclass.equals(ObjectClass.ACCOUNT))) {
Expand All @@ -514,6 +522,7 @@ public FilterTranslator<FilterWhereBuilder> createFilterTranslator(ObjectClass o
* Search for rows
* {@inheritDoc}
*/
@Override
public void executeQuery(ObjectClass oclass, FilterWhereBuilder where, ResultsHandler handler,
OperationOptions options) {
log.info("check the ObjectClass and result handler");
Expand Down Expand Up @@ -573,6 +582,7 @@ public void executeQuery(ObjectClass oclass, FilterWhereBuilder where, ResultsHa
/**
* {@inheritDoc}
*/
@Override
public void sync(ObjectClass oclass, SyncToken token, SyncResultsHandler handler, OperationOptions options) {
log.info("check the ObjectClass and result handler");
// Contract tests
Expand Down Expand Up @@ -654,6 +664,7 @@ public void sync(ObjectClass oclass, SyncToken token, SyncResultsHandler handler
/**
* {@inheritDoc}
*/
@Override
public SyncToken getLatestSyncToken(ObjectClass oclass) {
log.info("check the ObjectClass");
final String SQL_SELECT = "SELECT MAX( {0} ) FROM {1}";
Expand Down Expand Up @@ -717,6 +728,7 @@ public SyncToken getLatestSyncToken(ObjectClass oclass) {
/**
* {@inheritDoc}
*/
@Override
public Schema schema() {
try {
openConnection();
Expand All @@ -741,6 +753,7 @@ public Schema schema() {
* Test the configuration and connection
* {@inheritDoc}
*/
@Override
public void test() {
log.info("test");
try {
Expand Down Expand Up @@ -781,6 +794,7 @@ private void commit() throws SQLException {
* Attempts to authenticate the given username combination
* {@inheritDoc}
*/
@Override
public Uid authenticate(ObjectClass oclass, String username, GuardedString password,
OperationOptions options) {

Expand Down Expand Up @@ -853,6 +867,7 @@ public Uid authenticate(ObjectClass oclass, String username, GuardedString passw
* Attempts to resolve the given username
* {@inheritDoc}
*/
@Override
public Uid resolveUsername(ObjectClass oclass, String username, OperationOptions options) {
final String SQL_AUTH_QUERY = "SELECT {0} FROM {1} WHERE ( {0} = ? )";

Expand Down
1 change: 1 addition & 0 deletions ...le-connector/src/main/java/org/identityconnectors/databasetable/DatabaseTableSQLUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ static void setGuardedStringParam(final MappingStrategy sms, final PreparedState
final String name = param.getName();
try {
guard.access(new GuardedString.Accessor() {
@Override
public void access(char[] clearChars) {
try {
//Never use setString, the DB2 database will fail for secured columns
Expand Down
3 changes: 3 additions & 0 deletions ...nector/src/main/java/org/identityconnectors/databasetable/mapping/AttributeConvertor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public AttributeConvertor(MappingStrategy delegate) {
/* (non-Javadoc)
* @see org.identityconnectors.databasetable.MappingStrategy#getSQLParam(java.sql.ResultSet, int, int)
*/
@Override
public SQLParam getSQLParam(ResultSet resultSet, int i, String name, final int sqlType) throws SQLException {
// Convert all types to attribute supported types
final SQLParam param = delegate.getSQLParam(resultSet, i,name, sqlType);
Expand All @@ -64,13 +65,15 @@ public SQLParam getSQLParam(ResultSet resultSet, int i, String name, final int s
/* (non-Javadoc)
* @see org.identityconnectors.databasetable.MappingStrategy#getSQLAttributeType(int)
*/
@Override
public Class<?> getSQLAttributeType(int sqlType) {
return delegate.getSQLAttributeType(sqlType);
}

/* (non-Javadoc)
* @see org.identityconnectors.databasetable.MappingStrategy#setSQLParam(java.sql.PreparedStatement, int, org.identityconnectors.dbcommon.SQLParam)
*/
@Override
public void setSQLParam(final PreparedStatement stmt, final int idx, SQLParam parm) throws SQLException {
delegate.setSQLParam(stmt, idx, parm);
}
Expand Down
Loading
Loading