diff options
Diffstat (limited to 'aai-core/src/main/java/org')
-rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java | 13 | ||||
-rw-r--r-- | aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java b/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java index 817a6795..7f088569 100644 --- a/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java +++ b/aai-core/src/main/java/org/openecomp/aai/serialization/queryformats/utils/UrlBuilder.java @@ -25,7 +25,6 @@ import java.net.URI; import java.net.URISyntaxException; import org.apache.tinkerpop.gremlin.structure.Vertex; - import org.openecomp.aai.db.props.AAIProperties; import org.openecomp.aai.exceptions.AAIException; import org.openecomp.aai.introspection.Version; @@ -43,7 +42,13 @@ public class UrlBuilder { public UrlBuilder (Version version, DBSerializer serializer) throws AAIException { this.serializer = serializer; this.version = version; - this.serverBase = AAIApiServerURLBase.get(AAIProperties.LATEST); + this.serverBase = AAIApiServerURLBase.get(AAIProperties.LATEST); + } + + public UrlBuilder (Version version, DBSerializer serializer, String serverBase) { + this.serializer = serializer; + this.version = version; + this.serverBase = serverBase; } public String pathed(Vertex v) throws AAIFormatVertexException { @@ -71,4 +76,8 @@ public class UrlBuilder { return result.toString(); } + + protected String getServerBase(Version v) throws AAIException { + return AAIApiServerURLBase.get(v); + } } diff --git a/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java b/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java index 010f7a24..293ee723 100644 --- a/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java +++ b/aai-core/src/main/java/org/openecomp/aai/util/AAIConstants.java @@ -81,7 +81,8 @@ public final class AAIConstants { public static final String AAI_OLDSERVER_URL = "aai.oldserver.url"; public static final String AAI_GLOBAL_CALLBACK_URL = "aai.global.callback.url"; public static final String AAI_LOCAL_REST = "https://localhost:%d/aai/" + AAIProperties.LATEST + "/"; - + public static final String AAI_APP_ROOT = "/aai/"; + public static final int AAI_RESOURCES_PORT = 8447; public static final int AAI_QUERY_PORT = 8446; public static final int AAI_LEGACY_PORT = 8443; |