diff options
| -rw-r--r-- | aai-client-loadbalancer/pom.xml | 5 | ||||
| -rw-r--r-- | aai-core/pom.xml | 18 | ||||
| -rw-r--r-- | aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java | 32 | ||||
| -rw-r--r-- | aai-utils/pom.xml | 2 |
4 files changed, 16 insertions, 41 deletions
diff --git a/aai-client-loadbalancer/pom.xml b/aai-client-loadbalancer/pom.xml index 5ed63d4a..58454d6c 100644 --- a/aai-client-loadbalancer/pom.xml +++ b/aai-client-loadbalancer/pom.xml @@ -81,6 +81,11 @@ <artifactId>spring-retry</artifactId> <version>1.2.1.RELEASE</version> </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-http</artifactId> + <version>4.0.29.Final</version> + </dependency> </dependencies> <dependencyManagement> diff --git a/aai-core/pom.xml b/aai-core/pom.xml index c2f3410d..67fafa42 100644 --- a/aai-core/pom.xml +++ b/aai-core/pom.xml @@ -50,6 +50,7 @@ <activemq.version>5.15.3</activemq.version> <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit> <gremlin.version>3.2.2</gremlin.version> + <jetty.version>9.4.6.v20170531</jetty.version> </properties> <profiles> <profile> @@ -469,12 +470,7 @@ <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>9.4.2.v20170220</version> - </dependency> - <dependency> - <groupId>org.apache.cxf</groupId> - <artifactId>cxf-core</artifactId> - <version>3.0.6</version> + <version>${jetty.version}</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.module</groupId> @@ -608,11 +604,6 @@ </exclusions> </dependency> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jms</artifactId> - <version>2.15.5</version> - </dependency> - <dependency> <groupId>org.powermock</groupId> <artifactId>powermock-module-javaagent</artifactId> <version>1.6.2</version> @@ -639,6 +630,11 @@ <artifactId>gremlin-groovy</artifactId> <version>${gremlin.version}</version> </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring-jms</artifactId> + <version>4.3.2.RELEASE</version> + </dependency> </dependencies> <!-- Plugins and repositories --> diff --git a/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java index c26261a9..b3e4add7 100644 --- a/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java +++ b/aai-core/src/main/java/org/onap/aai/util/AAIApiVersion.java @@ -19,14 +19,10 @@ */ package org.onap.aai.util; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.apache.cxf.message.Message; -import org.apache.cxf.phase.PhaseInterceptorChain; - import org.onap.aai.exceptions.AAIException; +import java.util.regex.Pattern; + public class AAIApiVersion { private static final Pattern versionPattern = Pattern.compile("(^|\\/)(v\\d+)\\/"); @@ -42,29 +38,7 @@ public class AAIApiVersion { public static String get() throws AAIException { String apiVersion = null; - try { - Message message = PhaseInterceptorChain.getCurrentMessage(); - String requestURI = (String) message.get(Message.REQUEST_URI); - - if (requestURI != null) { - Matcher matcher = versionPattern.matcher(requestURI); - if (matcher.find() && matcher.groupCount() >= 2) { - apiVersion = matcher.group(2); - } - if (apiVersion == null) { - Matcher latestMatcher = latestVersionPattern.matcher(requestURI); - if (latestMatcher.find() && latestMatcher.groupCount() >= 2) { - apiVersion = AAIConfig.get(AAIConstants.AAI_DEFAULT_API_VERSION_PROP, AAIConstants.AAI_DEFAULT_API_VERSION); - } - } - - } - - } catch (Exception e) { - // TODO: we may want to log an error here - } - // TODO: should this check the value a little closer and look for a pattern? - if (apiVersion == null || !apiVersion.startsWith("v")) { + if (apiVersion == null || !apiVersion.startsWith("v")) { apiVersion = AAIConfig.get (AAIConstants.AAI_DEFAULT_API_VERSION_PROP, AAIConstants.AAI_DEFAULT_API_VERSION); //apiVersion = AAIConstants.AAI_DEFAULT_API_VERSION; } diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml index 3775658a..c44227a9 100644 --- a/aai-utils/pom.xml +++ b/aai-utils/pom.xml @@ -113,4 +113,4 @@ </plugins> </build> -</project>
\ No newline at end of file +</project> |