Skip to content

Commit

Permalink
Update Elide version form com.yahoo 7.0.0 to com.paiondata 1.0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
@Doom9527 @QubitPi
Doom9527 authored and QubitPi committed Jun 3, 2024
1 parent 7a95790 commit b46a9c7
Show file tree
Hide file tree
Showing 5 changed files with 60 additions and 59 deletions.
15 changes: 10 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<jar.finalName>astraios</jar.finalName>
<java.version>17</java.version>

<elide.version>7.0.5</elide.version>
<elide.version>1.0.9</elide.version>

<logback-access-spring-boot-starter.version>4.0.0</logback-access-spring-boot-starter.version>
<snakeyaml.version>2.2</snakeyaml.version>
Expand Down Expand Up @@ -78,7 +78,7 @@
</dependency>

<dependency>
<groupId>com.yahoo.elide</groupId>
<groupId>com.paiondata.elide</groupId>
<artifactId>elide-bom</artifactId>
<version>${elide.version}</version>
<type>pom</type>
Expand Down Expand Up @@ -111,9 +111,8 @@
</dependency>

<dependency>
<groupId>com.yahoo.elide</groupId>
<groupId>com.paiondata.elide</groupId>
<artifactId>elide-spring-boot-starter</artifactId>
<!-- Remove Tomcat -->
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
Expand Down Expand Up @@ -154,6 +153,12 @@
<artifactId>h2</artifactId>
</dependency>

<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20231013</version>
</dependency>

<dependency>
<groupId>org.liquibase</groupId>
<artifactId>liquibase-core</artifactId>
Expand All @@ -174,7 +179,7 @@

<!-- Test -->
<dependency>
<groupId>com.yahoo.elide</groupId>
<groupId>com.paiondata.elide</groupId>
<artifactId>elide-test-helpers</artifactId>
<version>${elide.version}</version>
<scope>test</scope>
Expand Down
34 changes: 15 additions & 19 deletions src/main/java/com/paiondata/astraios/config/ElideConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,21 @@
*/
package com.paiondata.astraios.config;

import com.yahoo.elide.Elide;
import com.yahoo.elide.ElideSettings;
import com.yahoo.elide.core.audit.Slf4jLogger;
import com.yahoo.elide.core.datastore.DataStore;
import com.yahoo.elide.core.dictionary.EntityDictionary;
import com.yahoo.elide.core.dictionary.Injector;
import com.yahoo.elide.core.filter.dialect.RSQLFilterDialect;
import com.yahoo.elide.core.utils.ClassScanner;
import com.yahoo.elide.core.utils.DefaultClassScanner;
import com.yahoo.elide.core.utils.coerce.CoerceUtil;
import com.yahoo.elide.datastores.jpa.JpaDataStore;
import com.yahoo.elide.datastores.jpa.PersistenceUnitInfoImpl;
import com.yahoo.elide.datastores.jpa.transaction.NonJtaTransaction;
import com.yahoo.elide.graphql.DefaultGraphQLFieldDefinitionCustomizer;
import com.yahoo.elide.graphql.GraphQLSettings;
import com.yahoo.elide.graphql.GraphQLSettingsBuilderCustomizer;
import com.yahoo.elide.graphql.annotation.GraphQLDescription;
import com.yahoo.elide.jsonapi.JsonApiSettings;
import com.yahoo.elide.spring.config.ElideConfigProperties;
import com.paiondata.elide.Elide;
import com.paiondata.elide.ElideSettings;
import com.paiondata.elide.core.audit.Slf4jLogger;
import com.paiondata.elide.core.datastore.DataStore;
import com.paiondata.elide.core.dictionary.EntityDictionary;
import com.paiondata.elide.core.dictionary.Injector;
import com.paiondata.elide.core.filter.dialect.RSQLFilterDialect;
import com.paiondata.elide.core.utils.ClassScanner;
import com.paiondata.elide.core.utils.DefaultClassScanner;
import com.paiondata.elide.core.utils.coerce.CoerceUtil;
import com.paiondata.elide.datastores.jpa.JpaDataStore;
import com.paiondata.elide.datastores.jpa.PersistenceUnitInfoImpl;
import com.paiondata.elide.datastores.jpa.transaction.NonJtaTransaction;
import com.paiondata.elide.jsonapi.JsonApiSettings;
import com.paiondata.elide.spring.config.ElideConfigProperties;

import com.paiondata.astraios.settings.ApplicationConfig;
import com.paiondata.astraios.settings.JpaDatastoreConfig;
Expand Down
34 changes: 17 additions & 17 deletions src/test/groovy/com/paiondata/astraios/config/AbstractITSpec.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,28 +15,28 @@
*/
package com.paiondata.astraios.config

import com.yahoo.elide.jsonapi.JsonApi
import com.paiondata.elide.jsonapi.JsonApi

import com.paiondata.astraios.models.Book

import org.apache.http.HttpStatus

import static com.yahoo.elide.test.graphql.GraphQLDSL.argument
import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments
import static com.yahoo.elide.test.graphql.GraphQLDSL.document
import static com.yahoo.elide.test.graphql.GraphQLDSL.field
import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation
import static com.yahoo.elide.test.graphql.GraphQLDSL.selection
import static com.yahoo.elide.test.graphql.GraphQLDSL.selections
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type

import com.yahoo.elide.swagger.OpenApiDocument.MediaType
import static com.paiondata.elide.test.graphql.GraphQLDSL.argument
import static com.paiondata.elide.test.graphql.GraphQLDSL.arguments
import static com.paiondata.elide.test.graphql.GraphQLDSL.document
import static com.paiondata.elide.test.graphql.GraphQLDSL.field
import static com.paiondata.elide.test.graphql.GraphQLDSL.mutation
import static com.paiondata.elide.test.graphql.GraphQLDSL.selection
import static com.paiondata.elide.test.graphql.GraphQLDSL.selections
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.attr
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.attributes
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.data
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.datum
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.id
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.resource
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.type

import com.paiondata.elide.swagger.OpenApiDocument.MediaType

import groovy.json.JsonBuilder
import io.restassured.RestAssured
Expand Down
34 changes: 17 additions & 17 deletions src/test/java/com/paiondata/astraios/SpringbootITSpec.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,25 @@
*/
package com.paiondata.astraios;

import static com.yahoo.elide.test.graphql.GraphQLDSL.argument;
import static com.yahoo.elide.test.graphql.GraphQLDSL.arguments;
import static com.yahoo.elide.test.graphql.GraphQLDSL.document;
import static com.yahoo.elide.test.graphql.GraphQLDSL.field;
import static com.yahoo.elide.test.graphql.GraphQLDSL.mutation;
import static com.yahoo.elide.test.graphql.GraphQLDSL.selection;
import static com.yahoo.elide.test.graphql.GraphQLDSL.selections;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attr;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.attributes;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.data;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.datum;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.id;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.resource;
import static com.yahoo.elide.test.jsonapi.JsonApiDSL.type;
import static com.paiondata.elide.test.graphql.GraphQLDSL.argument;
import static com.paiondata.elide.test.graphql.GraphQLDSL.arguments;
import static com.paiondata.elide.test.graphql.GraphQLDSL.document;
import static com.paiondata.elide.test.graphql.GraphQLDSL.field;
import static com.paiondata.elide.test.graphql.GraphQLDSL.mutation;
import static com.paiondata.elide.test.graphql.GraphQLDSL.selection;
import static com.paiondata.elide.test.graphql.GraphQLDSL.selections;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.attr;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.attributes;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.data;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.datum;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.id;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.resource;
import static com.paiondata.elide.test.jsonapi.JsonApiDSL.type;
import static org.hamcrest.Matchers.equalTo;

import com.yahoo.elide.core.exceptions.HttpStatus;
import com.yahoo.elide.jsonapi.JsonApi;
import com.yahoo.elide.swagger.OpenApiDocument.MediaType;
import com.paiondata.elide.swagger.OpenApiDocument.MediaType;
import com.paiondata.elide.core.exceptions.HttpStatus;
import com.paiondata.elide.jsonapi.JsonApi;

import org.junit.Assert;
import org.junit.jupiter.api.BeforeEach;
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/paiondata/astraios/models/Book.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package com.paiondata.astraios.models;

import com.yahoo.elide.annotation.Include;
import com.paiondata.elide.annotation.Include;

import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
Expand Down

0 comments on commit b46a9c7

Please sign in to comment.