From 5aa1e215d36cbef3ab40584ef6aab6d101bf8c9c Mon Sep 17 00:00:00 2001 From: "aparna.pradhan" Date: Mon, 7 Sep 2026 18:31:47 +0530 Subject: [PATCH] Build Issue Fixes and Cleanup --- pom.xml | 8 ++++- .../avroschema/TextClassificationRequest.java | 7 ----- .../TextClassificationResponse.java | 7 ----- .../FireBaseMessagingConfiguration.java | 2 ++ .../impl/FireBaseMessagingServiceImpl.java | 2 ++ .../FireBaseMessagingServiceNoOpImpl.java | 29 +++++++++++++++++++ 6 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/infy/service/impl/FireBaseMessagingServiceNoOpImpl.java diff --git a/pom.xml b/pom.xml index 854dbd4..6d413f5 100644 --- a/pom.xml +++ b/pom.xml @@ -366,7 +366,13 @@ - + + org.testng + testng + RELEASE + compile + + diff --git a/src/main/java/com/infy/avroschema/TextClassificationRequest.java b/src/main/java/com/infy/avroschema/TextClassificationRequest.java index 01c3ddb..89a9f56 100644 --- a/src/main/java/com/infy/avroschema/TextClassificationRequest.java +++ b/src/main/java/com/infy/avroschema/TextClassificationRequest.java @@ -1,10 +1,3 @@ -/* - * Copyright 2021 Infosys Ltd. - * Use of this source code is governed by GNU General Public License version 2 - * that can be found in the LICENSE file or at - * https://opensource.org/licenses/GPL-2.0 - */ - /** * Autogenerated by Avro * diff --git a/src/main/java/com/infy/avroschema/TextClassificationResponse.java b/src/main/java/com/infy/avroschema/TextClassificationResponse.java index e5596c2..a045592 100644 --- a/src/main/java/com/infy/avroschema/TextClassificationResponse.java +++ b/src/main/java/com/infy/avroschema/TextClassificationResponse.java @@ -1,10 +1,3 @@ -/* - * Copyright 2021 Infosys Ltd. - * Use of this source code is governed by GNU General Public License version 2 - * that can be found in the LICENSE file or at - * https://opensource.org/licenses/GPL-2.0 - */ - /** * Autogenerated by Avro * diff --git a/src/main/java/com/infy/config/FireBaseMessagingConfiguration.java b/src/main/java/com/infy/config/FireBaseMessagingConfiguration.java index aa21c4b..19b85fd 100644 --- a/src/main/java/com/infy/config/FireBaseMessagingConfiguration.java +++ b/src/main/java/com/infy/config/FireBaseMessagingConfiguration.java @@ -9,6 +9,7 @@ import java.io.IOException; +import org.springframework.boot.autoconfigure.condition.ConditionalOnResource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.ClassPathResource; @@ -19,6 +20,7 @@ import com.google.firebase.messaging.FirebaseMessaging; @Configuration +@ConditionalOnResource(resources = "classpath:forums-firebase.json") public class FireBaseMessagingConfiguration { @Bean diff --git a/src/main/java/com/infy/service/impl/FireBaseMessagingServiceImpl.java b/src/main/java/com/infy/service/impl/FireBaseMessagingServiceImpl.java index 54efd74..dacd3b0 100644 --- a/src/main/java/com/infy/service/impl/FireBaseMessagingServiceImpl.java +++ b/src/main/java/com/infy/service/impl/FireBaseMessagingServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.stereotype.Service; import com.google.firebase.messaging.FirebaseMessaging; @@ -22,6 +23,7 @@ import com.infy.service.FireBaseMessagingService; @Service +@ConditionalOnBean(FirebaseMessaging.class) public class FireBaseMessagingServiceImpl implements FireBaseMessagingService { private final Logger log = LoggerFactory.getLogger(FireBaseMessagingServiceImpl.class); diff --git a/src/main/java/com/infy/service/impl/FireBaseMessagingServiceNoOpImpl.java b/src/main/java/com/infy/service/impl/FireBaseMessagingServiceNoOpImpl.java new file mode 100644 index 0000000..9d8d242 --- /dev/null +++ b/src/main/java/com/infy/service/impl/FireBaseMessagingServiceNoOpImpl.java @@ -0,0 +1,29 @@ +/* + * Copyright 2021 Infosys Ltd. + * Use of this source code is governed by GNU General Public License version 2 + * that can be found in the LICENSE file or at + * https://opensource.org/licenses/GPL-2.0 + */ + +package com.infy.service.impl; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.stereotype.Service; + +import com.infy.domain.Notification; +import com.infy.service.FireBaseMessagingService; + +@Service +@ConditionalOnMissingBean(name = "fireBaseMessagingServiceImpl") +public class FireBaseMessagingServiceNoOpImpl implements FireBaseMessagingService { + + private final Logger log = LoggerFactory.getLogger(FireBaseMessagingServiceNoOpImpl.class); + + @Override + public String sendNotification(Notification notification, String token) { + log.warn("Firebase not configured (forums-firebase.json missing) — push notification skipped"); + return null; + } +}