Skip to content
Snippets Groups Projects
Verified Commit 00b4cf70 authored by Martin Weise's avatar Martin Weise
Browse files

Fixed the sniffing problem

parent 71378916
No related branches found
No related tags found
6 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!177Updated keycloak realms to only allow creation of containers for developers,...,!176Hotfix views,!172Resolve "Bug: Creating a view causes error while sniffing nodes"
Show whitespace changes
Inline Side-by-side
Showing
with 17 additions and 13 deletions
dbrepo-container-service/rest-service/src/main/java/at/tuwien/DbrepoContainerManagingApplication.java
+ 2
− 1
View file @ 00b4cf70
...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; ...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
...@@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -12,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoContainerManagingApplication { public class DbrepoContainerManagingApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-database-service/rest-service/src/main/java/at/tuwien/DbrepoDatabaseManagingApplication.java
+ 2
− 1
View file @ 00b4cf70
...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; ...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
...@@ -14,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -14,7 +15,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoDatabaseManagingApplication { public class DbrepoDatabaseManagingApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-identifier-service/rest-service/src/main/java/at/tuwien/DbrepoIdentifierServiceApplication.java
+ 2
− 2
View file @ 00b4cf70
...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication; ...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaAuditing @EnableJpaAuditing
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoIdentifierServiceApplication { public class DbrepoIdentifierServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/DbrepoMetadataServiceApplication.java
+ 2
− 2
View file @ 00b4cf70
...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication; ...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaAuditing @EnableJpaAuditing
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoMetadataServiceApplication { public class DbrepoMetadataServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-query-service/rest-service/src/main/java/at/tuwien/DbrepoQueryServiceApplication.java
+ 2
− 1
View file @ 00b4cf70
...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; ...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
...@@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoQueryServiceApplication { public class DbrepoQueryServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-semantics-service/rest-service/src/main/java/at/tuwien/DbrepoSemanticsServiceApplication.java
+ 2
− 2
View file @ 00b4cf70
...@@ -5,16 +5,16 @@ import org.springframework.boot.SpringApplication; ...@@ -5,16 +5,16 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
@EnableJpaAuditing @EnableJpaAuditing
@SpringBootApplication
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoSemanticsServiceApplication { public class DbrepoSemanticsServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-table-service/rest-service/src/main/java/at/tuwien/DbrepoTableServiceApplication.java
+ 2
− 2
View file @ 00b4cf70
...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication; ...@@ -4,18 +4,18 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableJpaAuditing @EnableJpaAuditing
@EnableTransactionManagement @EnableTransactionManagement
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class DbrepoTableServiceApplication { public class DbrepoTableServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
dbrepo-ui/pages/database/_database_id/view/_view_id/index.vue
+ 1
− 1
View file @ 00b4cf70
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<v-spacer /> <v-spacer />
<v-toolbar-title> <v-toolbar-title>
<v-btn v-if="canDeleteView" :loading="loadingDelete" color="error" class="mb-1" @click="deleteView"> <v-btn v-if="canDeleteView" :loading="loadingDelete" color="error" class="mb-1" @click="deleteView">
Delete <v-icon left>mdi-delete</v-icon> Delete
</v-btn> </v-btn>
</v-toolbar-title> </v-toolbar-title>
</v-toolbar> </v-toolbar>
......
dbrepo-user-service/rest-service/src/main/java/at/tuwien/FdaUserServiceApplication.java
+ 2
− 1
View file @ 00b4cf70
...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication; ...@@ -4,6 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration; import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories; import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
...@@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -16,7 +17,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.sdb"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.mdb"})
@SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class}) @SpringBootApplication(exclude = {ElasticsearchDataAutoConfiguration.class, ElasticsearchRestClientAutoConfiguration.class})
public class FdaUserServiceApplication { public class FdaUserServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment