Skip to content

Commit a351e3a

Browse files
committed
remove ApplicationProfile
reason: we will be going the spring profile route with the spring boot migration anyways
1 parent 583017d commit a351e3a

File tree

7 files changed

+8
-49
lines changed

7 files changed

+8
-49
lines changed

src/main/java/de/rwth/idsg/steve/ApplicationProfile.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/main/java/de/rwth/idsg/steve/SteveConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public enum SteveConfiguration {
5454
private final String contextPath;
5555
private final String steveVersion;
5656
private final String gitDescribe;
57-
private final ApplicationProfile profile;
57+
private final String profile;
5858
private final Ocpp ocpp;
5959
private final Auth auth;
6060
private final WebApi webApi;
@@ -71,8 +71,8 @@ public enum SteveConfiguration {
7171
steveVersion = p.getString("steve.version");
7272
gitDescribe = useFallbackIfNotSet(p.getOptionalString("git.describe"), null);
7373

74-
profile = ApplicationProfile.fromName(p.getString("profile"));
75-
System.setProperty("spring.profiles.active", profile.name().toLowerCase());
74+
profile = p.getString("profile");
75+
System.setProperty("spring.profiles.active", profile);
7676

7777
jetty = Jetty.builder()
7878
.serverHost(p.getString("server.host"))

src/test/java/de/rwth/idsg/steve/ApplicationJsonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class ApplicationJsonTest {
5454

5555
@BeforeAll
5656
public static void init() throws Exception {
57-
Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile());
57+
Assertions.assertEquals("test", SteveConfiguration.CONFIG.getProfile());
5858
__DatabasePreparer__.prepare();
5959

6060
app = new Application();

src/test/java/de/rwth/idsg/steve/ApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class ApplicationTest {
5555

5656
@BeforeAll
5757
public static void init() throws Exception {
58-
Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile());
58+
Assertions.assertEquals("test", SteveConfiguration.CONFIG.getProfile());
5959
__DatabasePreparer__.prepare();
6060

6161
app = new Application();

src/test/java/de/rwth/idsg/steve/OperationalTestSoapOCPP16.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class OperationalTestSoapOCPP16 {
8383

8484
@BeforeAll
8585
public static void initClass() throws Exception {
86-
Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile());
86+
Assertions.assertEquals("test", SteveConfiguration.CONFIG.getProfile());
8787

8888
app = new Application();
8989
app.start();

src/test/java/de/rwth/idsg/steve/StressTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public abstract class StressTest {
5050
protected static final int CONNECTOR_COUNT_PER_CHARGE_BOX = 25;
5151

5252
protected void attack() throws Exception {
53-
Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile());
53+
Assertions.assertEquals("test", SteveConfiguration.CONFIG.getProfile());
5454
Assertions.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations());
5555

5656
__DatabasePreparer__.prepare();

src/test/java/de/rwth/idsg/steve/issues/Issue73Fix.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import com.google.common.collect.Lists;
2222
import de.rwth.idsg.steve.Application;
23-
import de.rwth.idsg.steve.ApplicationProfile;
2423
import de.rwth.idsg.steve.SteveConfiguration;
2524
import de.rwth.idsg.steve.utils.__DatabasePreparer__;
2625
import ocpp.cs._2015._10.AuthorizationStatus;
@@ -53,7 +52,7 @@ public class Issue73Fix {
5352
private static final String path = getPath();
5453

5554
public static void main(String[] args) throws Exception {
56-
Assertions.assertEquals(ApplicationProfile.TEST, SteveConfiguration.CONFIG.getProfile());
55+
Assertions.assertEquals("test", SteveConfiguration.CONFIG.getProfile());
5756
Assertions.assertTrue(SteveConfiguration.CONFIG.getOcpp().isAutoRegisterUnknownStations());
5857

5958
__DatabasePreparer__.prepare();

0 commit comments

Comments
 (0)