1 files changed, 21 insertions, 6 deletions

diff --git a/src/main/java/org/onap/cps/temporal/service/NetworkDataServiceImpl.java b/src/main/java/org/onap/cps/temporal/service/NetworkDataServiceImpl.java
index 2e7afb2..687ba85 100644
--- a/src/main/java/org/onap/cps/temporal/service/NetworkDataServiceImpl.java
+++ b/src/main/java/org/onap/cps/temporal/service/NetworkDataServiceImpl.java
@@ -18,24 +18,39 @@
 
 package org.onap.cps.temporal.service;
 
+import java.util.Optional;
 import lombok.extern.slf4j.Slf4j;
 import org.onap.cps.temporal.domain.NetworkData;
+import org.onap.cps.temporal.domain.NetworkDataId;
 import org.onap.cps.temporal.repository.NetworkDataRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Service;
 
 /**
  * Service implementation for Network Data.
  */
-@Component
+@Service
 @Slf4j
 public class NetworkDataServiceImpl implements NetworkDataService {
 
-    @Autowired
-    NetworkDataRepository networkDataRepository;
+    private final NetworkDataRepository networkDataRepository;
+
+    public NetworkDataServiceImpl(final NetworkDataRepository networkDataRepository) {
+        this.networkDataRepository = networkDataRepository;
+    }
 
     @Override
     public NetworkData addNetworkData(final NetworkData networkData) {
-        return networkDataRepository.save(networkData);
+        final var savedNetworkData = networkDataRepository.save(networkData);
+        if (savedNetworkData.getCreatedTimestamp() == null) {
+            // Data already exists and can not be inserted
+            final var id =
+                    new NetworkDataId(
+                            networkData.getObservedTimestamp(), networkData.getDataspace(), networkData.getAnchor());
+            final Optional<NetworkData> existingNetworkData = networkDataRepository.findById(id);
+            throw new ServiceException(
+                    "Failed to create network data. It already exists: " + (existingNetworkData.orElse(null)));
+        }
+        return savedNetworkData;
     }
+
 }