diff options
| author |   FrancescoFioraEst <francesco.fiora@est.tech> | 2022-07-12 14:50:18 +0100 |
|---|---|---|
| committer | Francesco Fiora <francesco.fiora@est.tech> | 2022-07-14 07:39:13 +0000 |
| commit | a1b6bef1eea5144fb9a6f33b89f2daf914415e08 (patch) | |
| tree | 47856037c61e76a6b890b367a0251da5d1374cf4 /runtime | |
| parent | d0db79ad9ae0446bba6b5f5dbc6f51c34d7fb4d2 (diff) | |
Remove usage of jackson libraries from clamp runtime acm
Issue-ID: POLICY-4105
Change-Id: I04488a8a246e4c161e9a9eca86634844aba27872
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>
Diffstat (limited to 'runtime')
3 files changed, 0 insertions, 77 deletions
diff --git a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml index 7db468024..23eb6b37d 100644 --- a/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml +++ b/runtime/src/main/resources/clds/camel/rest/clamp-api-v2.xml @@ -1713,41 +1713,6 @@ </doTry> </route> </get> - <get uri="/v2/acm/getJsonSchema" outType="java.lang.String" bindingMode="off" produces="application/json"> - <route> - <removeHeaders pattern="*" - excludePattern="section"/> - <doTry> - <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=startLog(*, 'GET Json Schema ')"/> - <to uri="bean:org.onap.policy.clamp.authorization.AuthorizationController?method=authorize(*,'cl','','read')"/> - <setHeader name="Content-Type"> - <constant>application/json</constant> - </setHeader> - <setProperty name="raiseHttpExceptionFlag"> - <simple resultType="java.lang.Boolean">true</simple> - </setProperty> - <to uri="direct:get-json-schema"/> - <to uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=endLog()"/> - <doCatch> - <exception>java.lang.Exception</exception> - <handled> - <constant>true</constant> - </handled> - <to - uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=errorLog()"/> - <log loggingLevel="ERROR" - message="GET JSON Schema request failed: ${exception.stacktrace}"/> - <setHeader name="CamelHttpResponseCode"> - <constant>500</constant> - </setHeader> - <setBody> - <simple>GET JSON Schema FAILED</simple> - </setBody> - </doCatch> - </doTry> - </route> - </get> - <get uri="/v2/acm/getElementDefinitions" outType="java.lang.String" bindingMode="off" produces="application/json"> <route> <removeHeaders pattern="*" diff --git a/runtime/src/main/resources/clds/camel/routes/acm-flows.xml b/runtime/src/main/resources/clds/camel/routes/acm-flows.xml index 9150a2335..602fa8f4a 100644 --- a/runtime/src/main/resources/clds/camel/routes/acm-flows.xml +++ b/runtime/src/main/resources/clds/camel/routes/acm-flows.xml @@ -312,34 +312,6 @@ </doFinally> </doTry> </route> - <route id="get-json-schema"> - <from uri="direct:get-json-schema"/> - <doTry> - <log loggingLevel="INFO" - message="Getting the JSON Schema"/> - <to - uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeLog('AutomationComposition', 'Getting the JSON Schema')"/> - <setHeader name="CamelHttpMethod"> - <constant>GET</constant> - </setHeader> - <setHeader name="Content-Type"> - <constant>application/json</constant> - </setHeader> - <setProperty name="section"> - <simple>${header.section}</simple> - </setProperty> - <log loggingLevel="INFO" - message="Endpoint to get Json Schema: {{clamp.config.acm.runtime.url}}/onap/policy/clamp/acm/v2/commission/toscaServiceTemplateSchema"></log> - <toD - uri="{{clamp.config.acm.runtime.url}}/onap/policy/clamp/acm/v2/commission/toscaServiceTemplateSchema?section=${exchangeProperty[section]}&bridgeEndpoint=true&useSystemProperties=true&throwExceptionOnFailure=${exchangeProperty[raiseHttpExceptionFlag]}&authMethod=Basic&authUsername={{clamp.config.acm.runtime.userName}}&authPassword={{clamp.config.acm.runtime.password}}&authenticationPreemptive=true&connectionClose=true"/> - <convertBodyTo type="java.lang.String"/> - <doFinally> - <to uri="direct:reset-raise-http-exception-flag"/> - <to - uri="bean:org.onap.policy.clamp.flow.log.FlowLogOperation?method=invokeReturnLog()"/> - </doFinally> - </doTry> - </route> <route id="get-element-definitions"> <from uri="direct:get-element-definitions"/> <doTry> diff --git a/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeCommissioningResponseItTestCase.java b/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeCommissioningResponseItTestCase.java index 8c9c5b3e4..2d82dde86 100644 --- a/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeCommissioningResponseItTestCase.java +++ b/runtime/src/test/java/org/onap/policy/clamp/runtime/RuntimeCommissioningResponseItTestCase.java @@ -49,20 +49,6 @@ public class RuntimeCommissioningResponseItTestCase { + " \"name\": \"ToscaServiceTemplateSimple\", \"version\": \"1.0.0\", \"metadata\": {}}"; @Test - public void testToscaServiceTemplateSchemaStatus() { - ProducerTemplate prodTemplate = camelContext.createProducerTemplate(); - - Exchange exchangeResponse = - prodTemplate.send("direct:get-json-schema", ExchangeBuilder.anExchange(camelContext) - .withProperty("section", "data_types") - .withProperty("raiseHttpExceptionFlag", "true") - .build()); - - assertThat(HttpStatus.valueOf((Integer) exchangeResponse.getIn().getHeader(Exchange.HTTP_RESPONSE_CODE)) - .is2xxSuccessful()).isTrue(); - } - - @Test public void testToscaServiceTemplateStatus() { ProducerTemplate prodTemplate = camelContext.createProducerTemplate(); |