zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
anhefti 2022-10-03 12:26:32 +02:00
parent 415dcee8cb
commit 166659af11
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pom.xml
View file

@ -280,7 +280,8 @@
<groupId>com.fasterxml.jackson.dataformat</groupId> <groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId> <artifactId>jackson-dataformat-xml</artifactId>
</dependency> </dependency>
<dependency>
<!-- <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webflux</artifactId> <artifactId>spring-boot-starter-webflux</artifactId>
<exclusions> <exclusions>
@ -289,7 +290,7 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>-->
<!-- NOTE since org.springframework.security.oauth is not fully migrated <!-- NOTE since org.springframework.security.oauth is not fully migrated
to spring-boot-starter-security we have to declare a separate version here. to spring-boot-starter-security we have to declare a separate version here.
This refers to the latest version of spring-security-oauth2 and should be This refers to the latest version of spring-security-oauth2 and should be

7
src/main/java/ch/ethz/seb/sebserver/webservice/SEBServerMigrationStrategy.java
View file

@ -32,7 +32,6 @@ public class SEBServerMigrationStrategy implements FlywayMigrationStrategy {
private final WebserviceInfo webserviceInfo; private final WebserviceInfo webserviceInfo;
private final WebserviceInfoDAO webserviceInfoDAO; private final WebserviceInfoDAO webserviceInfoDAO;
private Flyway flyway; private Flyway flyway;
private final boolean migrationApplied = false;
public SEBServerMigrationStrategy( public SEBServerMigrationStrategy(
final WebserviceInfo webserviceInfo, final WebserviceInfo webserviceInfo,
@ -47,7 +46,6 @@ public class SEBServerMigrationStrategy implements FlywayMigrationStrategy {
@Override @Override
public void migrate(final Flyway flyway) { public void migrate(final Flyway flyway) {
this.flyway = flyway; this.flyway = flyway;
} }
public void applyMigration() { public void applyMigration() {
@ -57,11 +55,6 @@ public class SEBServerMigrationStrategy implements FlywayMigrationStrategy {
} }
final String webserviceUUID = this.webserviceInfo.getWebserviceUUID(); final String webserviceUUID = this.webserviceInfo.getWebserviceUUID();
if (this.migrationApplied) {
SEBServerInit.INIT_LOGGER.warn("Migration already applied for this webservice: {}", webserviceUUID);
return;
}
try { try {
SEBServerInit.INIT_LOGGER.info("----> ** Migration check START **"); SEBServerInit.INIT_LOGGER.info("----> ** Migration check START **");