Skip to content

Commit

Permalink
Clean up Repository classes
Browse files Browse the repository at this point in the history 
The Repository classes have been updated to no longer use
class fields to store the names of the parameters that define
the boundaries of the ranges. Instead, the classes will use
the setter & remover methods of the parameters directly.
This will make it easier to find the code that modifies the
parameters.
  • Loading branch information
@edewata
edewata committed Oct 21, 2024
1 parent a76eb4b commit 8477dfd
Show file tree
Hide file tree
Showing 7 changed files with 267 additions and 81 deletions.
50 changes: 46 additions & 4 deletions base/ca/src/main/java/com/netscape/cmscore/dbs/CRLRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,21 +67,18 @@ public void init() throws Exception {
rangeDN = dbConfig.getRequestRangeDN() + "," + dbSubsystem.getBaseDN();
logger.info("CRLRepository: - range DN: " + rangeDN);

minSerialName = DatabaseConfig.MIN_REQUEST_NUMBER;
String minSerial = dbConfig.getBeginRequestNumber();
if (minSerial != null) {
mMinSerialNo = new BigInteger(minSerial, mRadix);
}
logger.info("CRLRepository: - min serial: " + mMinSerialNo);

maxSerialName = DatabaseConfig.MAX_REQUEST_NUMBER;
String maxSerial = dbConfig.getEndRequestNumber();
if (maxSerial != null) {
mMaxSerialNo = new BigInteger(maxSerial, mRadix);
}
logger.info("CRLRepository: - max serial: " + mMaxSerialNo);

nextMinSerialName = DatabaseConfig.NEXT_MIN_REQUEST_NUMBER;
String nextMinSerial = dbConfig.getNextBeginRequestNumber();
if (nextMinSerial == null || nextMinSerial.equals("-1")) {
mNextMinSerialNo = null;
Expand All @@ -90,7 +87,6 @@ public void init() throws Exception {
}
logger.info("CRLRepository: - next min serial: " + mNextMinSerialNo);

nextMaxSerialName = DatabaseConfig.NEXT_MAX_REQUEST_NUMBER;
String nextMaxSerial = dbConfig.getNextEndRequestNumber();
if (nextMaxSerial == null || nextMaxSerial.equals("-1")) {
mNextMaxSerialNo = null;
Expand Down Expand Up @@ -129,6 +125,52 @@ public void init() throws Exception {
*/
}

public void setMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMinSerialNo.toString(mRadix);
logger.debug("CRLRepository: Setting min serial number: " + serial);
dbConfig.setBeginRequestNumber(serial);
}

public void setMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMaxSerialNo.toString(mRadix);
logger.debug("CRLRepository: Setting max serial number: " + serial);
dbConfig.setEndRequestNumber(serial);
}

public void setNextMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMinSerialNo == null) {
logger.debug("CRLRepository: Removing next min number");
dbConfig.removeNextBeginRequestNumber();

} else {
String serial = mNextMinSerialNo.toString(mRadix);
logger.debug("CRLRepository: Setting next min number: " + serial);
dbConfig.setNextBeginRequestNumber(serial);
}
}

public void setNextMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMaxSerialNo == null) {
logger.debug("CRLRepository: Removing next max number");
dbConfig.removeNextEndRequestNumber();

} else {
String serial = mNextMaxSerialNo.toString(mRadix);
logger.debug("CRLRepository: Setting next max number: " + serial);
dbConfig.setNextEndRequestNumber(serial);
}
}

/**
* Removes all objects with this repository.
*/
Expand Down
50 changes: 46 additions & 4 deletions base/ca/src/main/java/com/netscape/cmscore/dbs/CertificateRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,21 +137,18 @@ public void initLegacyGenerator() throws Exception {
rangeDN = mDBConfig.getSerialRangeDN() + "," + dbSubsystem.getBaseDN();
logger.debug("CertificateRepository: - range DN: " + rangeDN);

minSerialName = DatabaseConfig.MIN_SERIAL_NUMBER;
String minSerial = mDBConfig.getBeginSerialNumber();
if (minSerial != null) {
mMinSerialNo = new BigInteger(minSerial, mRadix);
}
logger.debug("CertificateRepository: - min serial: " + mMinSerialNo);

maxSerialName = DatabaseConfig.MAX_SERIAL_NUMBER;
String maxSerial = mDBConfig.getEndSerialNumber();
if (maxSerial != null) {
mMaxSerialNo = new BigInteger(maxSerial, mRadix);
}
logger.debug("CertificateRepository: - max serial: " + mMaxSerialNo);

nextMinSerialName = DatabaseConfig.NEXT_MIN_SERIAL_NUMBER;
String nextMinSerial = mDBConfig.getNextBeginSerialNumber();
if (nextMinSerial == null || nextMinSerial.equals("-1")) {
mNextMinSerialNo = null;
Expand All @@ -160,7 +157,6 @@ public void initLegacyGenerator() throws Exception {
}
logger.debug("CertificateRepository: - next min serial: " + mNextMinSerialNo);

nextMaxSerialName = DatabaseConfig.NEXT_MAX_SERIAL_NUMBER;
String nextMaxSerial = mDBConfig.getNextEndSerialNumber();
if (nextMaxSerial == null || nextMaxSerial.equals("-1")) {
mNextMaxSerialNo = null;
Expand All @@ -180,6 +176,52 @@ public void initLegacyGenerator() throws Exception {
}
}

public void setMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMinSerialNo.toString(mRadix);
logger.debug("CertificateRepository: Setting min serial number: " + serial);
dbConfig.setBeginSerialNumber(serial);
}

public void setMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMaxSerialNo.toString(mRadix);
logger.debug("CertificateRepository: Setting max serial number: " + serial);
dbConfig.setEndSerialNumber(serial);
}

public void setNextMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMinSerialNo == null) {
logger.debug("CertificateRepository: Removing next min number");
dbConfig.removeNextBeginSerialNumber();

} else {
String serial = mNextMinSerialNo.toString(mRadix);
logger.debug("CertificateRepository: Setting next min number: " + serial);
dbConfig.setNextBeginSerialNumber(serial);
}
}

public void setNextMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMaxSerialNo == null) {
logger.debug("CertificateRepository: Removing next max number");
dbConfig.removeNextEndSerialNumber();

} else {
String serial = mNextMaxSerialNo.toString(mRadix);
logger.debug("CertificateRepository: Setting next max number: " + serial);
dbConfig.setNextEndSerialNumber(serial);
}
}

/**
* Retrieves serial number management mode.
*
Expand Down
50 changes: 46 additions & 4 deletions base/kra/src/main/java/com/netscape/cmscore/dbs/KeyRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,18 @@ public void initLegacyGenerator() throws Exception {
rangeDN = dbConfig.getSerialRangeDN() + "," + dbSubsystem.getBaseDN();
logger.info("KeyRepository: - range DN: {}", rangeDN);

minSerialName = DatabaseConfig.MIN_SERIAL_NUMBER;
String minSerial = dbConfig.getBeginSerialNumber();
if (minSerial != null) {
mMinSerialNo = new BigInteger(minSerial, mRadix);
}
logger.info("KeyRepository: - min serial: {}", mMinSerialNo);

maxSerialName = DatabaseConfig.MAX_SERIAL_NUMBER;
String maxSerial = dbConfig.getEndSerialNumber();
if (maxSerial != null) {
mMaxSerialNo = new BigInteger(maxSerial, mRadix);
}
logger.info("KeyRepository: - max serial: {}", mMaxSerialNo);

nextMinSerialName = DatabaseConfig.NEXT_MIN_SERIAL_NUMBER;
String nextMinSerial = dbConfig.getNextBeginSerialNumber();
if (nextMinSerial == null || nextMinSerial.equals("-1")) {
mNextMinSerialNo = null;
Expand All @@ -198,7 +195,6 @@ public void initLegacyGenerator() throws Exception {
}
logger.info("KeyRepository: - next min serial: {}", mNextMinSerialNo);

nextMaxSerialName = DatabaseConfig.NEXT_MAX_SERIAL_NUMBER;
String nextMaxSerial = dbConfig.getNextEndSerialNumber();
if (nextMaxSerial == null || nextMaxSerial.equals("-1")) {
mNextMaxSerialNo = null;
Expand All @@ -218,6 +214,52 @@ public void initLegacyGenerator() throws Exception {
}
}

public void setMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMinSerialNo.toString(mRadix);
logger.debug("KeyRepository: Setting min serial number: " + serial);
dbConfig.setBeginSerialNumber(serial);
}

public void setMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMaxSerialNo.toString(mRadix);
logger.debug("KeyRepository: Setting max serial number: " + serial);
dbConfig.setEndSerialNumber(serial);
}

public void setNextMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMinSerialNo == null) {
logger.debug("KeyRepository: Removing next min number");
dbConfig.removeNextBeginSerialNumber();

} else {
String serial = mNextMinSerialNo.toString(mRadix);
logger.debug("KeyRepository: Setting next min number: " + serial);
dbConfig.setNextBeginSerialNumber(serial);
}
}

public void setNextMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMaxSerialNo == null) {
logger.debug("KeyRepository: Removing next max number");
dbConfig.removeNextEndSerialNumber();

} else {
String serial = mNextMaxSerialNo.toString(mRadix);
logger.debug("KeyRepository: Setting next max number: " + serial);
dbConfig.setNextEndSerialNumber(serial);
}
}

public DBSubsystem getDBSubsystem() {
return dbSubsystem;
}
Expand Down
24 changes: 24 additions & 0 deletions base/server/src/main/java/com/netscape/cmscore/apps/DatabaseConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,10 @@ public void setNextBeginSerialNumber(String nextBeginSerialNumber) {
putString(NEXT_MIN_SERIAL_NUMBER, nextBeginSerialNumber);
}

public void removeNextBeginSerialNumber() throws EBaseException {
remove(NEXT_MIN_SERIAL_NUMBER);
}

public String getNextEndSerialNumber() throws EBaseException {
return getString(NEXT_MAX_SERIAL_NUMBER, "-1");
}
Expand All @@ -156,6 +160,10 @@ public void setNextEndSerialNumber(String nextEndSerialNumber) {
putString(NEXT_MAX_SERIAL_NUMBER, nextEndSerialNumber);
}

public void removeNextEndSerialNumber() throws EBaseException {
remove(NEXT_MAX_SERIAL_NUMBER);
}

public String getSerialLowWaterMark() throws EBaseException {
return getString(SERIAL_LOW_WATER_MARK, "5000");
}
Expand Down Expand Up @@ -212,6 +220,10 @@ public void setNextBeginRequestNumber(String nextBeginRequestNumber) {
putString(NEXT_MIN_REQUEST_NUMBER, nextBeginRequestNumber);
}

public void removeNextBeginRequestNumber() throws EBaseException {
remove(NEXT_MIN_REQUEST_NUMBER);
}

public String getNextEndRequestNumber() throws EBaseException {
return getString(NEXT_MAX_REQUEST_NUMBER, "-1");
}
Expand All @@ -220,6 +232,10 @@ public void setNextEndRequestNumber(String nextEndRequestNumber) {
putString(NEXT_MAX_REQUEST_NUMBER, nextEndRequestNumber);
}

public void removeNextEndRequestNumber() throws EBaseException {
remove(NEXT_MAX_REQUEST_NUMBER);
}

public String getRequestLowWaterMark() throws EBaseException {
return getString(REQUEST_LOW_WATER_MARK, "5000");
}
Expand Down Expand Up @@ -276,6 +292,10 @@ public void setNextBeginReplicaNumber(String nextBeginReplicaNumber) {
putString(NEXT_MIN_REPLICA_NUMBER, nextBeginReplicaNumber);
}

public void removeNextBeginReplicaNumber() throws EBaseException {
remove(NEXT_MIN_REPLICA_NUMBER);
}

public String getNextEndReplicaNumber() throws EBaseException {
return getString(NEXT_MAX_REPLICA_NUMBER, "-1");
}
Expand All @@ -284,6 +304,10 @@ public void setNextEndReplicaNumber(String nextEndReplicaNumber) {
putString(NEXT_MAX_REPLICA_NUMBER, nextEndReplicaNumber);
}

public void removeNextEndReplicaNumber() throws EBaseException {
remove(NEXT_MAX_REPLICA_NUMBER);
}

public String getReplicaLowWaterMark() throws EBaseException {
return getString(REPLICA_LOW_WATER_MARK, "10");
}
Expand Down
50 changes: 46 additions & 4 deletions base/server/src/main/java/com/netscape/cmscore/dbs/ReplicaIDRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,21 +54,18 @@ public void init() throws Exception {
rangeDN = dbConfig.getReplicaRangeDN() + "," + dbSubsystem.getBaseDN();
logger.info("ReplicaIDRepository: - range DN: " + rangeDN);

minSerialName = DatabaseConfig.MIN_REPLICA_NUMBER;
String minSerial = dbConfig.getBeginReplicaNumber();
if (minSerial != null) {
mMinSerialNo = new BigInteger(minSerial, mRadix);
}
logger.info("ReplicaIDRepository: - min serial: " + mMinSerialNo);

maxSerialName = DatabaseConfig.MAX_REPLICA_NUMBER;
String maxSerial = dbConfig.getEndReplicaNumber();
if (maxSerial != null) {
mMaxSerialNo = new BigInteger(maxSerial, mRadix);
}
logger.info("ReplicaIDRepository: - max serial: " + mMaxSerialNo);

nextMinSerialName = DatabaseConfig.NEXT_MIN_REPLICA_NUMBER;
String nextMinSerial = dbConfig.getNextBeginReplicaNumber();
if (nextMinSerial == null || nextMinSerial.equals("-1")) {
mNextMinSerialNo = null;
Expand All @@ -77,7 +74,6 @@ public void init() throws Exception {
}
logger.info("ReplicaIDRepository: - next min serial: " + mNextMinSerialNo);

nextMaxSerialName = DatabaseConfig.NEXT_MAX_REPLICA_NUMBER;
String nextMaxSerial = dbConfig.getNextEndReplicaNumber();
if (nextMaxSerial == null || nextMaxSerial.equals("-1")) {
mNextMaxSerialNo = null;
Expand All @@ -97,6 +93,52 @@ public void init() throws Exception {
}
}

public void setMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMinSerialNo.toString(mRadix);
logger.debug("ReplicaIDRepository: Setting min serial number: " + serial);
dbConfig.setBeginReplicaNumber(serial);
}

public void setMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();
String serial = mMaxSerialNo.toString(mRadix);
logger.debug("ReplicaIDRepository: Setting max serial number: " + serial);
dbConfig.setEndReplicaNumber(serial);
}

public void setNextMinSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMinSerialNo == null) {
logger.debug("ReplicaIDRepository: Removing next min number");
dbConfig.removeNextBeginReplicaNumber();

} else {
String serial = mNextMinSerialNo.toString(mRadix);
logger.debug("ReplicaIDRepository: Setting next min number: " + serial);
dbConfig.setNextBeginReplicaNumber(serial);
}
}

public void setNextMaxSerialConfig() throws EBaseException {

DatabaseConfig dbConfig = dbSubsystem.getDBConfigStore();

if (mNextMaxSerialNo == null) {
logger.debug("ReplicaIDRepository: Removing next max number");
dbConfig.removeNextEndReplicaNumber();

} else {
String serial = mNextMaxSerialNo.toString(mRadix);
logger.debug("ReplicaIDRepository: Setting next max number: " + serial);
dbConfig.setNextEndReplicaNumber(serial);
}
}

/**
* Returns last serial number in given range
*/
Expand Down
Loading

0 comments on commit 8477dfd

Please sign in to comment.