Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolving dependency issues. #1

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
Draft

Resolving dependency issues. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9fedbf5
Resolving dependency issues.
annapaola Oct 14, 2024
a0d5452
integrate marmotgraph-commons library for the provisioning of dynamic…
olinux Oct 17, 2024
2b39264
fix linting issues
olinux Oct 17, 2024
bf58892
move to library with configuration endpoint replacing "settings"
olinux Oct 21, 2024
916a2df
adapt to new response structure of "config" endpoint
olinux Oct 21, 2024
3f2faca
fix auth adapter
olinux Oct 21, 2024
cb90b36
fix auth adapter
olinux Oct 21, 2024
639b910
migrate to vite, integrate generified library, update configuration
olinux Oct 22, 2024
df833f1
change to vite, use common library, fix linting issues
olinux Oct 22, 2024
5200328
make compatible with latest node and npm
olinux Oct 22, 2024
a912b04
add needed linting dependencies
olinux Oct 22, 2024
14cb974
add clientSecret to properties
olinux Oct 22, 2024
b945b47
use dark mode for logo
olinux Oct 24, 2024
41164f0
use appstore to distribute the application name and remove all hard c…
olinux Oct 24, 2024
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
88 changes: 3 additions & 85 deletions service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,93 +43,11 @@

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<groupId>org.marmotgraph</groupId>
<artifactId>marmotgraph-commons</artifactId>
<version>0.0.3</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
</dependency>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
<dependency>
<groupId>org.ehcache</groupId>
<artifactId>ehcache</artifactId>
<version>3.10.6</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-oauth2-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>9.0.80</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.7</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.6.13</version>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-spring-boot-starter</artifactId>
<version>6.9.0</version>
</dependency>
<dependency>
<groupId>io.sentry</groupId>
<artifactId>sentry-logback</artifactId>
<version>6.9.0</version>
</dependency>
<dependency>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>9.0.80</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
<version>1.9.5</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion service/src/main/java/eu/ebrains/kg/querybuilder/KgQueryBuilderApplication.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

@Configuration
@EnableAutoConfiguration
@ComponentScan
@ComponentScan({"org.marmotgraph", "eu.ebrains.kg"})
public class KgQueryBuilderApplication extends WebSecurityConfigurerAdapter {

public static void main(String[] args) {
Expand Down
3 changes: 1 addition & 2 deletions service/src/main/java/eu/ebrains/kg/querybuilder/api/Queries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package eu.ebrains.kg.querybuilder.api;

import eu.ebrains.kg.querybuilder.constants.Constants;
import eu.ebrains.kg.querybuilder.service.QueryClient;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand All @@ -25,7 +24,7 @@
import java.util.List;
import java.util.Map;

@RequestMapping(Constants.ROOT_PATH_OF_API + "/queries")
@RequestMapping("${org.marmotgraph.api.root:}/queries")
@RestController
public class Queries {

Expand Down
87 changes: 0 additions & 87 deletions service/src/main/java/eu/ebrains/kg/querybuilder/api/Settings.java
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions service/src/main/java/eu/ebrains/kg/querybuilder/api/Spaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,13 @@

package eu.ebrains.kg.querybuilder.api;

import eu.ebrains.kg.querybuilder.constants.Constants;
import eu.ebrains.kg.querybuilder.service.SpaceClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;

@RequestMapping(Constants.ROOT_PATH_OF_API + "/spaces")
@RequestMapping( "${org.marmotgraph.api.root:}/spaces")
@RestController
public class Spaces {

Expand Down
3 changes: 1 addition & 2 deletions service/src/main/java/eu/ebrains/kg/querybuilder/api/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@

package eu.ebrains.kg.querybuilder.api;

import eu.ebrains.kg.querybuilder.constants.Constants;
import eu.ebrains.kg.querybuilder.service.TypeClient;
import eu.ebrains.kg.querybuilder.model.TypeEntity;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

@RequestMapping(Constants.ROOT_PATH_OF_API + "/types")
@RequestMapping("${org.marmotgraph.api.root:}/types")
@RestController
public class Types {

Expand Down
3 changes: 1 addition & 2 deletions service/src/main/java/eu/ebrains/kg/querybuilder/api/Users.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package eu.ebrains.kg.querybuilder.api;

import eu.ebrains.kg.querybuilder.constants.Constants;
import eu.ebrains.kg.querybuilder.controller.IdController;
import eu.ebrains.kg.querybuilder.model.KGCoreResult;
import eu.ebrains.kg.querybuilder.model.UserProfile;
Expand All @@ -27,7 +26,7 @@

import java.util.UUID;

@RequestMapping(Constants.ROOT_PATH_OF_API + "/user")
@RequestMapping("${org.marmotgraph.api.root:}/user")
@RestController
public class Users {

Expand Down
84 changes: 0 additions & 84 deletions service/src/main/java/eu/ebrains/kg/querybuilder/configuration/OauthClient.java
View file
Open in desktop

This file was deleted.

Loading