Skip to content
This repository was archived by the owner on Nov 28, 2024. It is now read-only.

[DON'T MERGE] Update to 5.3 2 #3

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
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
35 changes: 35 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Hibernate OGM Cassandra CI

on:
push:
branches:
- master
tags: '*'
pull_request:
branches: master

jobs:
build:
name: Build the project and run the tests
runs-on: ubuntu-latest
services:
# Label used to access the service container
cassandra:
# Docker Hub image
image: cassandra:3.7
# options: >-
#--health-cmd="mysqladmin ping"
#--health-interval 10s
#--health-timeout 5s
#--health-retries 5
ports:
- 9042:9042
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
with:
java-version: 1.8
uses: actions/setup-java@v1
- name: Build with Maven
run: mvn clean install -s settings-example.xml

2 changes: 1 addition & 1 deletion cassandra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,18 @@
*/
package org.hibernate.ogm.datastore.cassandra.query.impl;

import java.util.Map;

import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Session;
import org.hibernate.boot.model.naming.Identifier;
import org.hibernate.engine.query.spi.OrdinalParameterDescriptor;
import org.hibernate.engine.query.spi.ParameterMetadata;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Table;
import org.hibernate.ogm.dialect.query.spi.ParameterMetadataBuilder;
import org.hibernate.query.internal.ParameterMetadataImpl;
import org.hibernate.type.Type;

import com.datastax.driver.core.ColumnDefinitions;
import com.datastax.driver.core.PreparedStatement;
import com.datastax.driver.core.Session;
import java.util.Map;

/**
* {@link ParameterMetadataBuilder} for native Cassandra CQL queries.
Expand All @@ -37,7 +36,7 @@ public CassandraParameterMetadataBuilder(Session session, Map<String, Table> met
}

@Override
public ParameterMetadata buildParameterMetadata(String nativeQuery) {
public ParameterMetadataImpl buildParameterMetadata(String nativeQuery) {
PreparedStatement preparedStatement = session.prepare( nativeQuery );
ColumnDefinitions columnDefinitions = preparedStatement.getVariables();
OrdinalParameterDescriptor[] ordinalDescriptors = new OrdinalParameterDescriptor[columnDefinitions.size()];
Expand All @@ -61,6 +60,6 @@ public ParameterMetadata buildParameterMetadata(String nativeQuery) {
}
}

return new ParameterMetadata( ordinalDescriptors, null );
return new ParameterMetadataImpl( ordinalDescriptors, null );
}
}
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/examples/gettingstarted/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
</parent>

<artifactId>hibernate-ogm-cassandra-documentation-examples-gettingstarted</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@
import javax.persistence.EntityManagerFactory;
import javax.persistence.Persistence;
import javax.transaction.TransactionManager;
import java.lang.invoke.MethodHandles;

public class DogBreedRunner {

private static final Log logger = LoggerFactory.make();
private static final Log logger = LoggerFactory.make( MethodHandles.lookup() );

public static void main(String[] args) {

Expand Down
2 changes: 1 addition & 1 deletion documentation/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<artifactId>hibernate-ogm-cassandra-documentation</artifactId>
<groupId>org.hibernate.ogm</groupId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>hibernate-ogm-cassandra-documentation-examples</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion documentation/javadoc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-documentation</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/manual/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion documentation/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion integrationtest/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>org.hibernate.ogm</groupId>
<artifactId>hibernate-ogm-cassandra-parent</artifactId>
<version>5.2.0-SNAPSHOT</version>
<version>5.3.2-SNAPSHOT</version>
</parent>

<artifactId>hibernate-ogm-cassandra-integrationtest</artifactId>
Expand Down
Loading