Commit ce1392e7 authored Oct 30, 2024 by Kostis Trantzas

Merge branch...

Merge branch '48-there-is-a-wrong-greek-character-in-catalog_get_resourcespec_by_name_category-message-name' into 'develop'

Resolve "There is a wrong greek character in CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY message name"

See merge request !39

parents beb57884 672eedfc

src/main/java/org/etsi/osl/tmf/rcm634/api/ResourceSpecificationApiRouteBuilder.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -35,8 +35,8 @@ public class ResourceSpecificationApiRouteBuilder extends RouteBuilder {
	private String CATALOG_GET_RESOURCESPEC_BY_ID = "";		private String CATALOG_GET_RESOURCESPEC_BY_ID = "";


	@Value("${CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY}")		@Value("${CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY}")
	private String CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY = "";		private String CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY = "";

	@Autowired		@Autowired
	private ProducerTemplate template;		private ProducerTemplate template;
	@@ -79,8 +79,8 @@ public class ResourceSpecificationApiRouteBuilder extends RouteBuilder {
	.marshal().json( JsonLibrary.Jackson)		.marshal().json( JsonLibrary.Jackson)
	.convertBodyTo( String.class );		.convertBodyTo( String.class );

	from( CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY )		from( CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY )
	.log(LoggingLevel.INFO, log, CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY + " message received!")		.log(LoggingLevel.INFO, log, CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY + " message received!")
	.to("log:DEBUG?showBody=true&showHeaders=true")		.to("log:DEBUG?showBody=true&showHeaders=true")
	.bean( resourceSpecificationRepoService, "findByNameAndCategoryAndVersionEager(${header.aname}, ${header.acategory}, ${header.aversion} )")		.bean( resourceSpecificationRepoService, "findByNameAndCategoryAndVersionEager(${header.aname}, ${header.acategory}, ${header.aversion} )")
	.marshal().json( JsonLibrary.Jackson)		.marshal().json( JsonLibrary.Jackson)

src/main/resources/application-testing.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -140,7 +140,7 @@ CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC"
	CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"		CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"
	CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"		CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"
	CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"		CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"
	CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ΝAME_CATEGORY"		CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_NAME_CATEGORY"
	EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"		EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"
	EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"		EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"
	EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"		EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"

src/main/resources/application.yml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -172,7 +172,7 @@ CATALOG_ADD_RESOURCESPEC: "jms:queue:CATALOG.ADD.RESOURCESPEC"
	CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"		CATALOG_UPD_RESOURCESPEC: "jms:queue:CATALOG.UPD.RESOURCESPEC"
	CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"		CATALOG_UPDADD_RESOURCESPEC: "jms:queue:CATALOG.UPDADD.RESOURCESPEC"
	CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"		CATALOG_GET_RESOURCESPEC_BY_ID: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ID"
	CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_ΝAME_CATEGORY"		CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY: "jms:queue:CATALOG.GET.RESOURCESPEC_BY_NAME_CATEGORY"
	EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"		EVENT_RESOURCE_CREATE: "jms:topic:EVENT.RESOURCE.CREATE"
	EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"		EVENT_RESOURCE_STATE_CHANGED: "jms:topic:EVENT.RESOURCE.STATECHANGED"
	EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"		EVENT_RESOURCE_DELETE: "jms:topic:EVENT.SERVICE.RESOURCE"