Skip to content

Commit

Permalink
Updates per PR Comments #134
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Bastide <pbastide@us.ibm.com>
  • Loading branch information
prb112 committed Oct 23, 2019
1 parent 3f5f2b5 commit cefc498
Show file tree
Hide file tree
Showing 88 changed files with 111 additions and 201 deletions.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,4 @@ test-output/
/pre-it-logs.zip
/server-logs/
/integration-test-results/
/integration-test-results.zip

# ignores removed projects
/fhir-replication-api/**/*
/integration-test-results.zip
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,6 @@
/**
* This class is a Cadf/EventStream/COS based implementation of the FHIR server
* AuditLogService interface
*
* @author Albert Wang
*
*/
public class WhcAuditCadfLogService implements AuditLogService {
private static final Logger logger = java.util.logging.Logger.getLogger(WhcAuditCadfLogService.class.getName());
Expand Down Expand Up @@ -91,14 +88,6 @@ public class WhcAuditCadfLogService implements AuditLogService {
public WhcAuditCadfLogService() {
super();
}

/*
* (non-Javadoc)
*
* @see
* com.ibm.fhir.audit.logging.api.AuditLogService#initialize(com.
* ibm.fhir.config.PropertyGroup)
*/
@Override
public void initialize(PropertyGroup auditLogProperties) throws Exception {

Expand Down Expand Up @@ -199,11 +188,6 @@ public void logEntry(AuditLogEntry logEntry) throws Exception {

}

/*
* (non-Javadoc)
*
* @see com.ibm.fhir.audit.logging.api.AuditLogService#isEnabled()
*/
@Override
public boolean isEnabled() {
return this.isEnabled;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.List;

/**
*
* Catalog Access to the backend adminstrative functions
*/
public interface ICatalogAccess {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.sql.Connection;

/**
*
* Definition of the Database Statement
*/
public interface IDatabaseStatement {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.api;

/**
*
* ParititionUnit Enumeration indicates how frequently a Parition is created.
*/
public enum PartitionUnit {
DAYS,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.api;

/**
*
* Tenant Status Enumeration
*/
public enum TenantStatus {
PROVISIONING,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.api;

/**
*
* Throws an undefined name exception
*/
public class UndefinedNameException extends DataAccessException {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTranslator;

/**
*
* Drops the table at the schema.table
*/
public class DropTable implements IDatabaseStatement {
private final String schemaName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTranslator;

/**
*
* JdbcConnectionProvider
*/
public class JdbcConnectionProvider implements IConnectionProvider {
private static final Logger logger = Logger.getLogger(JdbcConnectionProvider.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@
import com.ibm.fhir.database.utils.api.IDatabaseTranslator;

/**
*
* JdbcTarget for the database
*/
public class JdbcTarget implements IDatabaseTarget {

private final Connection connection;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@
import com.ibm.fhir.database.utils.common.DataDefinitionUtil;

/**
*
* DB2 Add Table Parition
*/
public class Db2AddTablePartition implements IDatabaseStatement {
private final String schemaName;
private final String tableName;
private final int partitionId;
private final String tablespaceName;



/**
* Public constructor
* @param tableName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.ibm.fhir.database.utils.common.DataDefinitionUtil;

/**
*
* DB2 Adds table to staging
*/
public class Db2AddTableToStaging implements IDatabaseStatement {
private final String schemaName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import com.ibm.fhir.database.utils.version.SchemaConstants;

/**
*
* Checks Compatibility with the DB2 Implementation that is used.
*/
public class Db2CheckCompatibility implements IDatabaseStatement {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
import com.ibm.fhir.database.utils.common.DataDefinitionUtil;

/**
*
* Creates the DB2 Table Space
*/
public class Db2CreateTablespace implements IDatabaseStatement {
private final String tablespaceName;
private final int extentSizeKB;

/**
*
* The constructor builds a table space with the given name.
* @param tablespaceName
*/
public Db2CreateTablespace(String tablespaceName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.ibm.fhir.database.utils.common.DataDefinitionUtil;

/**
*
* DB2 DetatchTable Partition
*/
public class Db2DetachTablePartition implements IDatabaseStatement {

Expand All @@ -25,8 +25,7 @@ public class Db2DetachTablePartition implements IDatabaseStatement {

// The name of the table the partition is moved into
private final String intoTableName;



/**
* Public constructor
* @param tableName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import com.ibm.fhir.database.utils.common.DataDefinitionUtil;

/**
*
* Drops the DB2 Tablespace
*/
public class Db2DropTablespace implements IDatabaseStatement {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.ibm.fhir.database.utils.common.JdbcPropertyAdapter;

/**
*
* Adapts properties to Derby
*/
public class DerbyPropertyAdapter extends JdbcPropertyAdapter {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.ibm.fhir.database.utils.api.UndefinedNameException;

/**
*
* translates database access to Derby supported access.
*/
public class DerbyTranslator implements IDatabaseTranslator {
private static final Logger logger = Logger.getLogger(DerbyTranslator.class.getName());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import java.util.Map;

/**
*
* Callable Statement Stub
*/
public class CallableStatementStub implements CallableStatement {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import java.util.concurrent.Executor;

/**
*
* Connection Stub
*/
public class ConnectionStub implements Connection {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import java.util.Calendar;

/**
*
* PreparedStatement Stub
*/
public class PreparedStatementStub implements PreparedStatement {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@
import java.util.Map;

/**
*
* Stub for ResultSet
*/
public class ResultSetStub implements ResultSet {

@SuppressWarnings("unused")
private final ConnectionStub connection;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* Add Column
*/
public class AddColumn {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.ibm.fhir.task.api.ITaskGroup;

/**
*
* BaseObject
*/
public abstract class BaseObject implements IDatabaseObject {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* Big Int Column
*/
public class BigIntColumn extends ColumnBase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* Blob Column
*/
public class BlobColumn extends ColumnBase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* CharColumn
*/
public class CharColumn extends ColumnBase {
private final int size;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* Column Types used in FHIR
*/
public enum ColumnType {
INT,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* DatabaseObjectType Enumeration
*/
public enum DatabaseObjectType {
TABLE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* Double Column
*/
public class DoubleColumn extends ColumnBase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* Group Privilege
*/
public class GroupPrivilege {
private final String groupName;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* Data Model Interface
*/
public interface IDataModel {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import com.ibm.fhir.task.api.ITaskGroup;

/**
*
* Defines the Database Object's expected methods.
*/
public interface IDatabaseObject {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* Int Column
*/
public class IntColumn extends ColumnBase {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
package com.ibm.fhir.database.utils.model;

/**
*
* Representing the SQL function
*/
public class Reorg {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseAdapter;

/**
*
* Sequence related to the SQL sequence
*/
public class Sequence extends BaseObject {
private final int cache;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.ibm.fhir.database.utils.api.IDatabaseTypeAdapter;

/**
*
* Timestamp Column
*/
public class TimestampColumn extends ColumnBase {

Expand Down
Loading

0 comments on commit cefc498

Please sign in to comment.