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.

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

Add new CountryEICode #169

Merged
merged 4 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the refactoring !

Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ public class CountryEICode {
/**
* code string
*/
private String codeString; //find in Market_Areas_v1.0.pdf
private final String codeString; //find in Market_Areas_v1.0.pdf

/**
* country
*/
private Country country;
private final Country country;

/**
* @param codeString default constructor
Expand All @@ -45,79 +45,67 @@ public CountryEICode(Country country) {
* @return return Country
*/
public Country getCountry() {
switch (codeString) {
case "10YBE----------2" : return Country.BE;
case "10YSK-SEPS-----K" : return Country.SK;
case "10YCB-GERMANY--8" : return Country.DE;
case "10YHU-MAVIR----U" : return Country.HU;
case "10YNL----------L" : return Country.NL;
case "10YAT-APG------L" : return Country.AT;
case "10YCZ-CEPS-----N" : return Country.CZ;
case "10YHR-HEP------M" : return Country.HR;
case "10YPL-AREA-----S" : return Country.PL;
case "10YRO-TEL------P" : return Country.RO;
case "10YSI-ELES-----O" : return Country.SI;
case "10YFR-RTE------C" : return Country.FR;
case "10YES-REE------0" : return Country.ES;
case "10YCS-SERBIATSOV" : return Country.RS;
case "10YCB-SWITZERL-D" :
case "10YCH-SWISSGRIDZ" :
return Country.CH;
case "10YPT-REN------W" : return Country.PT;
case "10YCA-BULGARIA-R" :
case "10YCB-BULGARIA-F" :
return Country.BG;
case "10YAL-KESH-----5" :
case "10YCB-ALBANIA--1" :
return Country.AL;
case "10YCB-TURKEY---V" :
case "10YTR-TEIAS----W" :
return Country.TR;
case "10Y1001C--00003F" : return Country.UA;
case "10YMK-MEPSO----8" : return Country.MK;
case "10YBA-JPCC-----D" : return Country.BA;
case "10YCS-CG-TSO---S" : return Country.ME;
case "10YCB-GREECE---2" :
case "10YGR-HTSO-----Y" :
return Country.GR;
case "10YCB-ITALY----1" :
case "10YIT-GRTN-----B" :
return Country.IT;
case "10YDK-1--------W" : return Country.DK;
default: throw new IllegalArgumentException(String.format("Unknown CountryEICode: %s.", codeString));
}
return switch (codeString) {
case "10YBE----------2" -> Country.BE;
case "10YSK-SEPS-----K" -> Country.SK;
case "10YDE-VE-------2", "10YCB-GERMANY--8" -> Country.DE;
case "10YHU-MAVIR----U" -> Country.HU;
case "10YNL----------L" -> Country.NL;
case "10YAT-APG------L" -> Country.AT;
case "10YCZ-CEPS-----N" -> Country.CZ;
case "10YHR-HEP------M" -> Country.HR;
case "10YPL-AREA-----S" -> Country.PL;
case "10YRO-TEL------P" -> Country.RO;
case "10YSI-ELES-----O" -> Country.SI;
case "10YFR-RTE------C" -> Country.FR;
case "10YES-REE------0" -> Country.ES;
case "10YCS-SERBIATSOV" -> Country.RS;
case "10YCB-SWITZERL-D", "10YCH-SWISSGRIDZ" -> Country.CH;
case "10YPT-REN------W" -> Country.PT;
case "10YCA-BULGARIA-R", "10YCB-BULGARIA-F" -> Country.BG;
case "10YAL-KESH-----5", "10YCB-ALBANIA--1" -> Country.AL;
case "10YTR-TEIAS----W", "10YCB-TURKEY---V" -> Country.TR;
case "10Y1001C--00003F" -> Country.UA;
case "10YMK-MEPSO----8" -> Country.MK;
case "10YBA-JPCC-----D" -> Country.BA;
case "10YCS-CG-TSO---S" -> Country.ME;
case "10YGR-HTSO-----Y", "10YCB-GREECE---2" -> Country.GR;
case "10YIT-GRTN-----B", "10YCB-ITALY----1" -> Country.IT;
case "10YDK-1--------W" -> Country.DK;
default -> throw new IllegalArgumentException("Unknown CountryEICode: " + codeString + ".");
};
}

public String getCode() {
switch (country) {
case BE : return "10YBE----------2";
case SK : return "10YSK-SEPS-----K";
case DE : return "10YCB-GERMANY--8";
case HU : return "10YHU-MAVIR----U";
case NL : return "10YNL----------L";
case AT : return "10YAT-APG------L";
case CZ : return "10YCZ-CEPS-----N";
case HR : return "10YHR-HEP------M";
case PL : return "10YPL-AREA-----S";
case RO : return "10YRO-TEL------P";
case SI : return "10YSI-ELES-----O";
case FR : return "10YFR-RTE------C";
case ES : return "10YES-REE------0";
case RS : return "10YCS-SERBIATSOV";
case CH : return "10YCH-SWISSGRIDZ";
case PT : return "10YPT-REN------W";
case BG : return "10YCA-BULGARIA-R";
case AL : return "10YAL-KESH-----5";
case TR : return "10YTR-TEIAS----W";
case UA : return "10Y1001C--00003F";
case MK : return "10YMK-MEPSO----8";
case BA : return "10YBA-JPCC-----D";
case ME : return "10YCS-CG-TSO---S";
case GR : return "10YGR-HTSO-----Y";
case IT : return "10YIT-GRTN-----B";
case DK : return "10YDK-1--------W";
OpenSuze marked this conversation as resolved.
Show resolved Hide resolved
default: throw new IllegalArgumentException(String.format("Unknown CountryEICode for Country %s.", country.toString()));
OpenSuze marked this conversation as resolved.
Show resolved Hide resolved
}
return switch (country) {
case BE -> "10YBE----------2";
case SK -> "10YSK-SEPS-----K";
case DE -> "10YCB-GERMANY--8";
case HU -> "10YHU-MAVIR----U";
case NL -> "10YNL----------L";
case AT -> "10YAT-APG------L";
case CZ -> "10YCZ-CEPS-----N";
case HR -> "10YHR-HEP------M";
case PL -> "10YPL-AREA-----S";
case RO -> "10YRO-TEL------P";
case SI -> "10YSI-ELES-----O";
case FR -> "10YFR-RTE------C";
case ES -> "10YES-REE------0";
case RS -> "10YCS-SERBIATSOV";
case CH -> "10YCH-SWISSGRIDZ";
case PT -> "10YPT-REN------W";
case BG -> "10YCA-BULGARIA-R";
case AL -> "10YAL-KESH-----5";
case TR -> "10YTR-TEIAS----W";
case UA -> "10Y1001C--00003F";
case MK -> "10YMK-MEPSO----8";
case BA -> "10YBA-JPCC-----D";
case ME -> "10YCS-CG-TSO---S";
case GR -> "10YGR-HTSO-----Y";
case IT -> "10YIT-GRTN-----B";
case DK -> "10YDK-1--------W";
default -> throw new IllegalArgumentException("Unknown CountryEICode for Country " + country + ".");
};
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

/**
* @author Sebastien Murgey {@literal <sebastien.murgey@rte-france.com>}
Expand All @@ -21,6 +22,7 @@ void testEicCodeConvergence() {
assertEquals(Country.AT, new CountryEICode("10YAT-APG------L").getCountry());
assertEquals(Country.BE, new CountryEICode("10YBE----------2").getCountry());
assertEquals(Country.CZ, new CountryEICode("10YCZ-CEPS-----N").getCountry());
assertEquals(Country.DE, new CountryEICode("10YDE-VE-------2").getCountry());
assertEquals(Country.DE, new CountryEICode("10YCB-GERMANY--8").getCountry());
assertEquals(Country.FR, new CountryEICode("10YFR-RTE------C").getCountry());
assertEquals(Country.HR, new CountryEICode("10YHR-HEP------M").getCountry());
Expand All @@ -32,17 +34,26 @@ void testEicCodeConvergence() {
assertEquals(Country.SK, new CountryEICode("10YSK-SEPS-----K").getCountry());
assertEquals(Country.ES, new CountryEICode("10YES-REE------0").getCountry());
assertEquals(Country.RS, new CountryEICode("10YCS-SERBIATSOV").getCountry());
assertEquals(Country.CH, new CountryEICode("10YCB-SWITZERL-D").getCountry());
assertEquals(Country.CH, new CountryEICode("10YCH-SWISSGRIDZ").getCountry());
assertEquals(Country.PT, new CountryEICode("10YPT-REN------W").getCountry());
assertEquals(Country.BG, new CountryEICode("10YCA-BULGARIA-R").getCountry());
assertEquals(Country.BG, new CountryEICode("10YCB-BULGARIA-F").getCountry());
assertEquals(Country.AL, new CountryEICode("10YAL-KESH-----5").getCountry());
assertEquals(Country.AL, new CountryEICode("10YCB-ALBANIA--1").getCountry());
assertEquals(Country.TR, new CountryEICode("10YTR-TEIAS----W").getCountry());
assertEquals(Country.TR, new CountryEICode("10YCB-TURKEY---V").getCountry());
assertEquals(Country.UA, new CountryEICode("10Y1001C--00003F").getCountry());
assertEquals(Country.MK, new CountryEICode("10YMK-MEPSO----8").getCountry());
assertEquals(Country.BA, new CountryEICode("10YBA-JPCC-----D").getCountry());
assertEquals(Country.ME, new CountryEICode("10YCS-CG-TSO---S").getCountry());
assertEquals(Country.GR, new CountryEICode("10YGR-HTSO-----Y").getCountry());
assertEquals(Country.GR, new CountryEICode("10YCB-GREECE---2").getCountry());
assertEquals(Country.IT, new CountryEICode("10YIT-GRTN-----B").getCountry());
assertEquals(Country.IT, new CountryEICode("10YCB-ITALY----1").getCountry());
assertEquals(Country.DK, new CountryEICode("10YDK-1--------W").getCountry());
IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> new CountryEICode("invalid code"));
assertEquals("Unknown CountryEICode: invalid code.", e.getMessage());
}

@Test
Expand Down Expand Up @@ -72,6 +83,9 @@ void testEicCodeFromCountry() {
assertEquals("10YCS-CG-TSO---S", new CountryEICode(Country.ME).getCode());
assertEquals("10YGR-HTSO-----Y", new CountryEICode(Country.GR).getCode());
assertEquals("10YIT-GRTN-----B", new CountryEICode(Country.IT).getCode());
assertEquals("10YDK-1--------W", new CountryEICode(Country.DK).getCode());
IllegalArgumentException e = assertThrows(IllegalArgumentException.class, () -> new CountryEICode(Country.BR));
assertEquals("Unknown CountryEICode for Country BR.", e.getMessage());
}

}
Loading