Tenants

service/pom.xml

@@ -43,97 +43,15 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter</artifactId>
+			<groupId>org.marmotgraph</groupId>
+			<artifactId>marmotgraph-commons</artifactId>
+			<version>0.0.4</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>
-			<version>1.18.22</version>
+			<version>1.18.34</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>

service/src/main/java/eu/ebrains/kg/querybuilder/KgQueryBuilderApplication.java

@@ -25,7 +25,7 @@
 
 @Configuration
 @EnableAutoConfiguration
-@ComponentScan
+@ComponentScan({"org.marmotgraph", "eu.ebrains.kg"})
 public class KgQueryBuilderApplication extends WebSecurityConfigurerAdapter {
 
     public static void main(String[] args) {

service/src/main/java/eu/ebrains/kg/querybuilder/api/Queries.java

@@ -24,7 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-@RequestMapping("/queries")
+@RequestMapping("${org.marmotgraph.api.root:}/queries")
 @RestController
 public class Queries {
 
@@ -35,7 +35,7 @@ public Queries(QueryClient queryClient) {
     }
 
     @GetMapping
-    public Map<?, ?> getQueries(@RequestParam("type") String type) {
+    public Map<?, ?> getQueries(@RequestParam(value = "type", required = false) String type) {
         return queryClient.getQueries(type);
     }
 

service/src/main/java/eu/ebrains/kg/querybuilder/api/Spaces.java

@@ -22,7 +22,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import java.util.Map;
 
-@RequestMapping("/spaces")
+@RequestMapping( "${org.marmotgraph.api.root:}/spaces")
 @RestController
 public class Spaces {
 

service/src/main/java/eu/ebrains/kg/querybuilder/api/Types.java

@@ -23,7 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
-@RequestMapping("/types")
+@RequestMapping("${org.marmotgraph.api.root:}/types")
 @RestController
 public class Types {
 

service/src/main/java/eu/ebrains/kg/querybuilder/api/Users.java

@@ -16,17 +16,17 @@
 
 package eu.ebrains.kg.querybuilder.api;
 
-import eu.ebrains.kg.querybuilder.controller.IdController;
 import eu.ebrains.kg.querybuilder.model.KGCoreResult;
 import eu.ebrains.kg.querybuilder.model.UserProfile;
 import eu.ebrains.kg.querybuilder.service.UserClient;
+import org.marmotgraph.commons.controller.IdController;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.UUID;
 
-@RequestMapping("/user")
+@RequestMapping("${org.marmotgraph.api.root:}/user")
 @RestController
 public class Users {