Commit e8132114 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch... 

Merge branch '15-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 !12
parents 80d15ab4 5f9797af

src/main/java/org/etsi/osl/cridge/CatalogClient.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -36,8 +36,8 @@ public class CatalogClient extends RouteBuilder{ 
	@Value("${CATALOG_GET_RESOURCESPEC_BY_ID}")

	@Value("${CATALOG_GET_RESOURCESPEC_BY_ID}")

	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 = "";









	@Value("${CATALOG_UPDADD_RESOURCESPEC}")

	@Value("${CATALOG_UPDADD_RESOURCESPEC}")
@@ -87,7 +87,7 @@ public class CatalogClient extends RouteBuilder{ 
			map.put( "acategory", aCategory);

			map.put( "acategory", aCategory);

			map.put( "aversion", aVersion);

			map.put( "aversion", aVersion);

			Object response = 

			Object response = 

					template.requestBodyAndHeaders( CATALOG_GET_RESOURCESPEC_BY_ΝAME_CATEGORY, null, map);

					template.requestBodyAndHeaders( CATALOG_GET_RESOURCESPEC_BY_NAME_CATEGORY, null, map);





			if ( !(response instanceof String)) {

			if ( !(response instanceof String)) {

				logger.error("Resource Specification object is wrong.");

				logger.error("Resource Specification object is wrong.");

src/main/resources/application.yml

+1 −1
Original line number Original line Diff line number Diff line
@@ -38,7 +38,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"









#CRD ACTIONS

#CRD ACTIONS