From 58c7c977bed829fe010849cdf1b3f654c3c8cc02 Mon Sep 17 00:00:00 2001 From: xuegao Date: Thu, 26 Sep 2019 13:29:10 +0200 Subject: [PATCH] Remove Policy dependencies Remove policy related dependencies from the pom.xml Issue-ID: CLAMP-512y Change-Id: I734539be2c80eacd2340f865dffc50f47c55dd86 Signed-off-by: xuegao --- docs/swagger/swagger.json | 150 ++++++++++----------- docs/swagger/swagger.pdf | 6 +- pom.xml | 143 -------------------- src/main/resources/META-INF/resources/swagger.html | 2 +- src/main/resources/application-noaaf.properties | 12 +- 5 files changed, 85 insertions(+), 228 deletions(-) diff --git a/docs/swagger/swagger.json b/docs/swagger/swagger.json index ab7e827b..0738c6f2 100644 --- a/docs/swagger/swagger.json +++ b/docs/swagger/swagger.json @@ -4,7 +4,7 @@ "version" : "4.1.2-SNAPSHOT", "title" : "Clamp Rest API" }, - "host" : "localhost:38405", + "host" : "localhost:34219", "basePath" : "/restservices/clds/", "schemes" : [ "http" ], "paths" : { @@ -421,14 +421,14 @@ "JsonArray" : { "type" : "object", "properties" : { - "asString" : { - "type" : "string" + "asBoolean" : { + "type" : "boolean" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "asBoolean" : { - "type" : "boolean" + "asString" : { + "type" : "string" }, "asDouble" : { "type" : "number", @@ -466,26 +466,26 @@ "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" }, - "jsonPrimitive" : { + "jsonArray" : { "type" : "boolean" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, "jsonObject" : { "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" - }, - "jsonArray" : { + "jsonPrimitive" : { "type" : "boolean" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" } }, "x-className" : { @@ -531,14 +531,14 @@ "number" : { "type" : "boolean" }, - "asString" : { - "type" : "string" + "asBoolean" : { + "type" : "boolean" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "asBoolean" : { - "type" : "boolean" + "asString" : { + "type" : "string" }, "asDouble" : { "type" : "number", @@ -579,26 +579,26 @@ "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" }, - "jsonPrimitive" : { + "jsonArray" : { "type" : "boolean" }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" - }, "jsonObject" : { "type" : "boolean" }, "jsonNull" : { "type" : "boolean" }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" - }, - "jsonArray" : { + "jsonPrimitive" : { "type" : "boolean" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" } } }, @@ -642,35 +642,17 @@ "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, - "asString" : { - "type" : "string" - }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" - }, - "jsonPrimitive" : { - "type" : "boolean" - }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" }, - "jsonObject" : { + "asBoolean" : { "type" : "boolean" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "jsonNull" : { - "type" : "boolean" - }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" - }, - "jsonArray" : { - "type" : "boolean" - }, - "asBoolean" : { - "type" : "boolean" + "asString" : { + "type" : "string" }, "asDouble" : { "type" : "number", @@ -704,6 +686,24 @@ "asShort" : { "type" : "integer", "format" : "int32" + }, + "jsonArray" : { + "type" : "boolean" + }, + "jsonObject" : { + "type" : "boolean" + }, + "jsonNull" : { + "type" : "boolean" + }, + "jsonPrimitive" : { + "type" : "boolean" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" } }, "x-className" : { @@ -760,35 +760,17 @@ "asJsonPrimitive" : { "$ref" : "#/definitions/JsonPrimitive" }, - "asString" : { - "type" : "string" - }, - "asJsonObject" : { - "$ref" : "#/definitions/JsonObject" - }, - "jsonPrimitive" : { - "type" : "boolean" - }, - "asJsonArray" : { - "$ref" : "#/definitions/JsonArray" + "asJsonNull" : { + "$ref" : "#/definitions/JsonNull" }, - "jsonObject" : { + "asBoolean" : { "type" : "boolean" }, "asNumber" : { "$ref" : "#/definitions/Number" }, - "jsonNull" : { - "type" : "boolean" - }, - "asJsonNull" : { - "$ref" : "#/definitions/JsonNull" - }, - "jsonArray" : { - "type" : "boolean" - }, - "asBoolean" : { - "type" : "boolean" + "asString" : { + "type" : "string" }, "asDouble" : { "type" : "number", @@ -822,6 +804,24 @@ "asShort" : { "type" : "integer", "format" : "int32" + }, + "jsonArray" : { + "type" : "boolean" + }, + "jsonObject" : { + "type" : "boolean" + }, + "jsonNull" : { + "type" : "boolean" + }, + "jsonPrimitive" : { + "type" : "boolean" + }, + "asJsonObject" : { + "$ref" : "#/definitions/JsonObject" + }, + "asJsonArray" : { + "$ref" : "#/definitions/JsonArray" } } }, diff --git a/docs/swagger/swagger.pdf b/docs/swagger/swagger.pdf index 5f3307b6..29975894 100644 --- a/docs/swagger/swagger.pdf +++ b/docs/swagger/swagger.pdf @@ -4,8 +4,8 @@ << /Title (Clamp Rest API) /Creator (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) /Producer (Asciidoctor PDF 1.5.0.alpha.10, based on Prawn 1.3.0) -/CreationDate (D:20190919142605+02'00') -/ModDate (D:20190919142605+02'00') +/CreationDate (D:20190924114758+02'00') +/ModDate (D:20190924114758+02'00') >> endobj 2 0 obj @@ -3447,7 +3447,7 @@ ET BT 71.30850000000001 592.176 Td /F1.0 10.5 Tf -<203a206c6f63616c686f73743a3338343035> Tj +<203a206c6f63616c686f73743a3334323139> Tj ET 0.000 0.000 0.000 SCN diff --git a/pom.xml b/pom.xml index 5d0c767d..eb0a70bd 100644 --- a/pom.xml +++ b/pom.xml @@ -462,149 +462,6 @@ persistence-api 1.0.2 - - org.onap.policy.engine - PolicyEngineAPI - 1.3.3 - - - com.google.guava - guava - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - mysql - mysql-connector-java - - - commons-io - commons-io - - - grizzly-http-server - org.glassfish.grizzly - - - org.onap.dmaap.messagerouter.dmaapclient - dmaapClient - - - org.onap.policy.common - integrity-monitor - - - org.onap.policy.common - integrity-audit - - - com.fasterxml.jackson.core - jackson-databind - - - org.onap.aaf.cadi - cadi-aaf - - - javax.jms - jms - - - commons-fileupload - commons-fileupload - - - com.att.research.xacml - xacml - - - - - org.onap.policy.common - ONAP-Logging - 1.2.3 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - - - org.onap.policy.drools-applications.controlloop.common - policy-yaml - 1.2.3 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - - - org.onap.policy.drools-applications.controlloop.common.model-impl - sdc - 1.2.3 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - - - org.onap.policy.drools-applications.controlloop.common.model-impl - aai - 1.2.3 - - - log4j - log4j - - - org.slf4j - slf4j-log4j12 - - - apache-log4j-extras - log4j - - - org.apache.commons commons-csv diff --git a/src/main/resources/META-INF/resources/swagger.html b/src/main/resources/META-INF/resources/swagger.html index 17507b66..b20d0c26 100644 --- a/src/main/resources/META-INF/resources/swagger.html +++ b/src/main/resources/META-INF/resources/swagger.html @@ -589,7 +589,7 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b

1.2. URI scheme

-

Host : localhost:38405
+

Host : localhost:34219
BasePath : /restservices/clds/
Schemes : HTTP

diff --git a/src/main/resources/application-noaaf.properties b/src/main/resources/application-noaaf.properties index ce4a76ff..580ec3f4 100644 --- a/src/main/resources/application-noaaf.properties +++ b/src/main/resources/application-noaaf.properties @@ -97,7 +97,7 @@ camel.springboot.xmlRests=classpath:/clds/camel/rest/*.xml #clds datasource connection details spring.datasource.cldsdb.driverClassName=org.mariadb.jdbc.Driver -spring.datasource.cldsdb.url=jdbc:mariadb:sequential://third-party-proxy:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 +spring.datasource.cldsdb.url=jdbc:mariadb:sequential://localhost:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3 spring.datasource.cldsdb.username=clds spring.datasource.cldsdb.password=4c90a0b48204383f4283448d23e0b885a47237b2a23588e7c4651604f51c1067 spring.datasource.cldsdb.validationQuery=SELECT 1 @@ -149,10 +149,10 @@ clamp.config.dcae.deployment.template=classpath:/clds/templates/dcae-deployment- # # # Configuration Settings for Policy Engine Components -clamp.config.policy.api.url=http4://third-party-proxy:8085 +clamp.config.policy.api.url=http4://localhost:8085 clamp.config.policy.api.userName=healthcheck clamp.config.policy.api.password=zb!XztG34 -clamp.config.policy.pap.url=http4://third-party-proxy:8085 +clamp.config.policy.pap.url=http4://localhost:8085 clamp.config.policy.pap.userName=healthcheck clamp.config.policy.pap.password=zb!XztG34 @@ -208,17 +208,17 @@ clamp.config.action.insert.test.event=false clamp.config.clds.service.cache.invalidate.after.seconds=120 #DCAE Inventory Url Properties -clamp.config.dcae.inventory.url=http://third-party-proxy:8085 +clamp.config.dcae.inventory.url=http://localhost:8085 clamp.config.dcae.intentory.retry.interval=10000 clamp.config.dcae.intentory.retry.limit=5 #DCAE Dispatcher Url Properties -clamp.config.dcae.dispatcher.url=http://third-party-proxy:8085 +clamp.config.dcae.dispatcher.url=http://localhost:8085 clamp.config.dcae.dispatcher.retry.interval=20000 clamp.config.dcae.dispatcher.retry.limit=30 #DCAE Deployment Url Properties -clamp.config.dcae.deployment.url=http4://third-party-proxy:8085 +clamp.config.dcae.deployment.url=http4://localhost:8085 clamp.config.dcae.deployment.userName=test clamp.config.dcae.deployment.password=test -- 2.16.6