src/main/java/com/mediamanager/repository/SamplingRateRepository.java

@@ -53,7 +53,7 @@ public class SamplingRateRepository {
         EntityManager em = entityManagerFactory.createEntityManager();
         try{
             SamplingRate samplingRate = em.find(SamplingRate.class, id);
-            return Optional.ofNullable(samplingRate);
+            return Optional.of(samplingRate);
         }finally {
             if (em.isOpen()) em.close();
         }

src/main/java/com/mediamanager/service/samplingrate/SamplingRateService.java

@@ -32,36 +32,26 @@ public class SamplingRateService {
     }
 
     public Optional<SamplingRate> getSamplingRateById(Integer id) {
-        if (id == null) {
-            throw new IllegalArgumentException("ID cannot be null");
-        }
         logger.info("Getting sampling rate by id:{}", id);
         return repository.findById(id);
     }
 
     public Optional<SamplingRate> updateSamplingRate(Integer id, String value) {
-        if (id == null) {
+    logger.info("Updating sampling rate:{}", value);
-            throw new IllegalArgumentException("ID cannot be null");
+    if (value == null || value.trim().isEmpty()) {
-        }
+    throw new IllegalArgumentException("Sampling-Rate value cannot be null or empty");}
-        logger.info("Updating sampling rate:{}", value);
+    Optional<SamplingRate> existingSamplingRate = repository.findById(id);
-        if (value == null || value.trim().isEmpty()) {
+    if(existingSamplingRate.isEmpty()) {
-            throw new IllegalArgumentException("Sampling-Rate value cannot be null or empty");
+        logger.warn("Sampling rate not found with id:{}", id);
-        }
+        return Optional.empty();
-        Optional<SamplingRate> existingSamplingRate = repository.findById(id);
+    }
-        if(existingSamplingRate.isEmpty()) {
+    SamplingRate samplingRate = existingSamplingRate.get();
-            logger.warn("Sampling rate not found with id:{}", id);
+    samplingRate.setValue(value);
-            return Optional.empty();
+    SamplingRate updatedSamplingRate = repository.update(samplingRate);
-        }
+    return Optional.of(updatedSamplingRate);
-        SamplingRate samplingRate = existingSamplingRate.get();
-        samplingRate.setValue(value);
-        SamplingRate updatedSamplingRate = repository.update(samplingRate);
-        return Optional.of(updatedSamplingRate);
     }
 
     public boolean deleteSamplingRate(Integer id) {
-        if (id == null) {
-            throw new IllegalArgumentException("Sampling rate id cannot be null");
-        }
         logger.info("Deleting sampling rate:{}", id);
         return repository.deleteById(id);
     }