diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/constants/LCPProjectConstants.java b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/constants/LCPProjectConstants.java index 33adafcea5f1b7..3636edf0f9a4ce 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/constants/LCPProjectConstants.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/constants/LCPProjectConstants.java @@ -21,16 +21,14 @@ public static Map getLocations() { private static final Map _locations = HashMapBuilder.put( "AS1", LCPProject.Cluster.AS1.toString() - ).put( - "DEV", LCPProject.Cluster.DEV.toString() ).put( "EU2", LCPProject.Cluster.EU2.toString() ).put( "EU3", LCPProject.Cluster.EU3.toString() ).put( - "SA", LCPProject.Cluster.SA.toString() + "INTERNAL", LCPProject.Cluster.INTERNAL.toString() ).put( - "UAT", LCPProject.Cluster.UAT.toString() + "SA", LCPProject.Cluster.SA.toString() ).put( "US", LCPProject.Cluster.US.toString() ).build(); diff --git a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/LCPProject.java b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/LCPProject.java index b9934bb6b3c4d9..7f1a5eda73f4f0 100644 --- a/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/LCPProject.java +++ b/modules/dxp/apps/osb/osb-faro/osb-faro-engine-client/src/main/java/com/liferay/osb/faro/engine/client/model/LCPProject.java @@ -105,23 +105,17 @@ public void setStatus(String status) { public enum Cluster { AS1("ac-asiasouth1", "asia-south1-ac5-c1"), - DEV("ac-asahdev", "us-west1-ac-uat-c1-2"), EU2("ac-europewest2", "europe-west2-ac2-c1"), EU3("ac-europewest3", "europe-west3-ac3-c1"), + INTERNAL("ac-internal", "us-west1-ac-uat-c1"), SA("ac-southamericaeast1", "southamerica-east1-ac1-c1"), - UAT("ac-asahuat", "us-west1-ac-uat-c1"), - US("ac-uswest1", "us-west1-ac4-c1"), - US_LRDCOM("ac-uswest1", "us-west1-ac4-c1-2"); + US("ac-uswest1", "us-west1-ac4-c1"); public static Cluster fromString(String value) { if (StringUtil.equals(value, Cluster.AS1._value)) { return Cluster.AS1; } - if (StringUtil.equals(value, Cluster.DEV._value)) { - return Cluster.DEV; - } - if (StringUtil.equals(value, Cluster.EU2._value)) { return Cluster.EU2; } @@ -130,22 +124,18 @@ public static Cluster fromString(String value) { return Cluster.EU3; } - if (StringUtil.equals(value, Cluster.SA._value)) { - return Cluster.SA; + if (StringUtil.equals(value, Cluster.INTERNAL._value)) { + return Cluster.INTERNAL; } - if (StringUtil.equals(value, Cluster.UAT._value)) { - return Cluster.UAT; + if (StringUtil.equals(value, Cluster.SA._value)) { + return Cluster.SA; } if (StringUtil.equals(value, Cluster.US._value)) { return Cluster.US; } - if (StringUtil.equals(value, Cluster.US_LRDCOM._value)) { - return Cluster.US_LRDCOM; - } - return null; }