Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ on:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{github.event.pull_request.head.ref}}
repository: ${{github.event.pull_request.head.repo.full_name}}
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:

jobs:
test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down Expand Up @@ -60,7 +60,9 @@ jobs:
github_token: ${{ secrets.GITHUB_TOKEN }}
files: ./**/build/test-results/**/*.xml
dependency-check:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Dependency Check
uses: hypertrace/github-actions/dependency-check@main
uses: hypertrace/github-actions/dependency-check@main
with:
nvd-api-key: ${{ secrets.NVD_API_KEY }}
12 changes: 5 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ on:

jobs:
publish-artifacts:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
# Set fetch-depth: 0 to fetch commit history and tags for use in version calculation
- name: Check out code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand All @@ -21,8 +21,6 @@ jobs:
with:
args: publish
env:
ORG_GRADLE_PROJECT_artifactory_contextUrl: ${{ secrets.ARTIFACTORY_CONTEXT_URL }}
ORG_GRADLE_PROJECT_artifactory_user: ${{ secrets.ARTIFACTORY_PUBLISH_USER }}
ORG_GRADLE_PROJECT_artifactory_password: ${{ secrets.ARTIFACTORY_PUBLISH_TOKEN }}


ORG_GRADLE_PROJECT_maven_repo_url: ${{ secrets.HAR_REPO_URL }}
ORG_GRADLE_PROJECT_maven_user: ${{ secrets.HAR_PUBLISH_USER }}
ORG_GRADLE_PROJECT_maven_password: ${{ secrets.HAR_PUBLISH_TOKEN }}
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,4 @@

###### org.hypertrace.core.documentstore

[![CircleCI](https://circleci.com/gh/hypertrace/document-store.svg?style=svg)](https://circleci.com/gh/hypertrace/document-store)

A library that provides an interface for performing CRUD operations for the document-oriented store. Currently, it also provides an implementation for mongo.
10 changes: 5 additions & 5 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import org.hypertrace.gradle.publishing.HypertracePublishExtension
import org.hypertrace.gradle.publishing.License

plugins {
id("org.hypertrace.repository-plugin") version "0.4.0"
id("org.hypertrace.ci-utils-plugin") version "0.3.0"
id("org.hypertrace.publish-plugin") version "1.0.2" apply false
id("org.hypertrace.code-style-plugin") version "1.1.0" apply false
id("org.owasp.dependencycheck") version "8.4.3"
id("org.hypertrace.repository-plugin") version "0.5.0"
id("org.hypertrace.ci-utils-plugin") version "0.4.0"
id("org.hypertrace.publish-plugin") version "1.1.1" apply false
id("org.hypertrace.code-style-plugin") version "2.1.2" apply false
id("org.owasp.dependencycheck") version "12.1.0"
}

subprojects {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public class Utils {
public static final String MONGO_LAST_UPDATE_TIME_KEY = "_lastUpdateTime";
public static final String MONGO_LAST_UPDATED_TIME_KEY = "lastUpdatedTime";
public static final String MONGO_CREATED_TIME_KEY = "createdTime";

/** Postgres related time fields */
public static final String POSTGRES_UPDATED_AT = "updated_at";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ CloseableIterator<Document> query(
*/
boolean deleteAll();

/** @return the number of documents in the collection */
/**
* @return the number of documents in the collection
*/
long count();

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ public class DatastoreProvider {
entry(DatabaseType.MONGO, MongoTypesafeDatastoreConfigAdapter::new),
entry(DatabaseType.POSTGRES, PostgresTypesafeDatastoreConfigAdapter::new));

/** @deprecated Use {@link DatastoreProvider#getDatastore(DatastoreConfig)} instead */
/**
* @deprecated Use {@link DatastoreProvider#getDatastore(DatastoreConfig)} instead
*/
@Deprecated
public static Datastore getDatastore(String type, Config config) {
return Optional.ofNullable(type)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
public enum AggregationOperator {
AVG,
COUNT,
/** @deprecated Use {@link AggregationOperator#DISTINCT_ARRAY} instead. */
/**
* @deprecated Use {@link AggregationOperator#DISTINCT_ARRAY} instead.
*/
@Deprecated(forRemoval = true)
DISTINCT,
DISTINCT_ARRAY, // This operator generates an array of distinct values
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ public PostgresDatastore(@NonNull final DatastoreConfig datastoreConfig) {
}
}

/** @return Returns Tables for a particular database */
/**
* @return Returns Tables for a particular database
*/
@Override
public Set<String> listCollections() {
// Relevant bits of the table metadata schema:
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 4 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
zipStorePath=wrapper/dists
Loading