Commit aa7182a7 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'develop' into 

84-implement-hub-api-and-events-for-service-catalog-v4-api
parents a87c4ebd 3c724094

Dockerfile

+2 −2
Original line number Diff line number Diff line 
FROM ibm-semeru-runtimes:open-17.0.7_7-jdk

# RUN mkdir /opt/shareclasses

RUN mkdir -p /opt/openslice/lib/

COPY target/org.etsi.osl.tmf.api-1.2.0-exec.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.2.0-exec.jar"]

COPY target/org.etsi.osl.tmf.api-1.3.0-SNAPSHOT-exec.jar /opt/openslice/lib/

CMD ["java", "-Xshareclasses:cacheDir=/opt/shareclasses", "-jar", "/opt/openslice/lib/org.etsi.osl.tmf.api-1.3.0-SNAPSHOT-exec.jar"]

EXPOSE 13082
 
 No newline at end of file

pom.xml

+9 −17
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
	<parent>

		<groupId>org.etsi.osl</groupId>

		<artifactId>org.etsi.osl.main</artifactId>

		<version>2025Q2</version>

		<version>2025Q4-SNAPSHOT</version>

		<relativePath>../org.etsi.osl.main</relativePath>

	</parent>
@@ -281,21 +281,6 @@ 
			<artifactId>spring-security-test</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.junit.jupiter</groupId>

			<artifactId>junit-jupiter-engine</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.junit.platform</groupId>

			<artifactId>junit-platform-commons</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.junit.platform</groupId>

			<artifactId>junit-platform-runner</artifactId>

			<scope>test</scope>

		</dependency>

		<dependency>

			<groupId>org.mockito</groupId>

			<artifactId>mockito-inline</artifactId>
@@ -448,13 +433,17 @@ 
                <!-- Disable parallel execution -->

                	<parallel>none</parallel>

                	<runOrder>alphabetical</runOrder>

                	<forkCount>1</forkCount>

                	<forkCount>3</forkCount>

                	<reuseForks>true</reuseForks>

            	</configuration>

			</plugin>

			<plugin>

				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>0.8.12</version>

				<configuration>

					<skip>true</skip>

				</configuration>

				<executions>

					<execution>

						<goals>
@@ -475,6 +464,9 @@ 
				<groupId>org.jacoco</groupId>

				<artifactId>jacoco-maven-plugin</artifactId>

				<version>0.8.12</version>

				<configuration>

					<skip>true</skip>

				</configuration>

				<executions>

					<execution>

						<goals>

src/main/java/org/etsi/osl/tmf/pcm620/reposervices/CatalogCallbackService.java

+17 −5
Original line number Diff line number Diff line
@@ -91,8 +91,13 @@ public class CatalogCallbackService { 
            ResponseEntity<String> response = restTemplate.exchange(

                url, HttpMethod.POST, entity, String.class);



            if (response!=null) {

              logger.info("Successfully sent catalog create event to callback URL: {} - Response: {}", 

                url, response.getStatusCode());   

            } else {

              logger.error("category delete event to callback URL: {} - Response: IS NULL", 

                  url);

            }

            

        } catch (Exception e) {

            logger.error("Failed to send catalog create event to callback URL: {}", url, e);
@@ -115,8 +120,15 @@ public class CatalogCallbackService { 
            ResponseEntity<String> response = restTemplate.exchange(

                url, HttpMethod.POST, entity, String.class);

            



            if (response!=null) {

              logger.info("Successfully sent catalog delete event to callback URL: {} - Response: {}", 

                url, response.getStatusCode());        

            } else {

              logger.error("catalog delete event to callback URL: {} - Response: IS NULL", 

                  url);

            }

            

            

        } catch (Exception e) {

            logger.error("Failed to send catalog delete event to callback URL: {}", url, e);

src/main/java/org/etsi/osl/tmf/pcm620/reposervices/CatalogNotificationService.java

+4 −2
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ public class CatalogNotificationService { 
            eventPublisher.publishEvent(notification, catalog.getUuid());

            

            // Send callbacks to registered subscribers

            if ( catalogCallbackService!=null )

              catalogCallbackService.sendCatalogCreateCallback(notification.getEvent());

            

            logger.info("Published catalog create notification for catalog ID: {}", catalog.getUuid());
@@ -77,6 +78,7 @@ public class CatalogNotificationService { 
            eventPublisher.publishEvent(notification, catalog.getUuid());

            

            // Send callbacks to registered subscribers

            if ( catalogCallbackService!=null )

              catalogCallbackService.sendCatalogDeleteCallback(notification.getEvent());

            

            logger.info("Published catalog delete notification for catalog ID: {}", catalog.getUuid());

src/main/java/org/etsi/osl/tmf/pcm620/reposervices/CategoryCallbackService.java

+15 −6
Original line number Diff line number Diff line
@@ -90,8 +90,13 @@ public class CategoryCallbackService { 
            ResponseEntity<String> response = restTemplate.exchange(

                url, HttpMethod.POST, entity, String.class);



            if (response!=null) {

              logger.info("Successfully sent category create event to callback URL: {} - Response: {}", 

                url, response.getStatusCode());   

            } else {

              logger.error("category delete event to callback URL: {} - Response: IS NULL", 

                  url);

            }

            

        } catch (Exception e) {

            logger.error("Failed to send category create event to callback URL: {}", callbackUrl, e);
@@ -113,9 +118,13 @@ public class CategoryCallbackService { 
            

            ResponseEntity<String> response = restTemplate.exchange(

                url, HttpMethod.POST, entity, String.class);

            

            if (response!=null) {

              logger.info("Successfully sent category delete event to callback URL: {} - Response: {}", 

                  url, response.getStatusCode());             

            } else {

              logger.error("category delete event to callback URL: {} - Response: IS NULL", 

                  url);

            }

            

        } catch (Exception e) {

            logger.error("Failed to send category delete event to callback URL: {}", callbackUrl, e);