Removed external artifact from repository.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpAuthenticationMessageHandler.java

@@ -24,7 +24,6 @@ import org.eclipse.hawkbit.dmf.json.model.TenantSecurityToken.FileResource;
 import org.eclipse.hawkbit.repository.ArtifactManagement;
 import org.eclipse.hawkbit.repository.ControllerManagement;
 import org.eclipse.hawkbit.repository.exception.EntityNotFoundException;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.AmqpRejectAndDontRequeueException;
@@ -122,7 +121,7 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
      *            download this artifact
      */
     private void checkIfArtifactIsAssignedToTarget(final TenantSecurityToken secruityToken,
-            final LocalArtifact localArtifact) {
+            final org.eclipse.hawkbit.repository.model.Artifact localArtifact) {
 
         if (secruityToken.getControllerId() != null) {
             checkByControllerId(localArtifact, secruityToken.getControllerId());
@@ -135,7 +134,8 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
 
     }
 
-    private void checkByTargetId(final LocalArtifact localArtifact, final Long targetId) {
+    private void checkByTargetId(final org.eclipse.hawkbit.repository.model.Artifact localArtifact,
+            final Long targetId) {
         LOG.debug("no anonymous download request, doing authentication check for target {} and artifact {}", targetId,
                 localArtifact);
         if (!controllerManagement.hasTargetArtifactAssigned(targetId, localArtifact)) {
@@ -146,7 +146,8 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
         LOG.info("download security check for target {} and artifact {} granted", targetId, localArtifact);
     }
 
-    private void checkByControllerId(final LocalArtifact localArtifact, final String controllerId) {
+    private void checkByControllerId(final org.eclipse.hawkbit.repository.model.Artifact localArtifact,
+            final String controllerId) {
         LOG.debug("no anonymous download request, doing authentication check for target {} and artifact {}",
                 controllerId, localArtifact);
         if (!controllerManagement.hasTargetArtifactAssigned(controllerId, localArtifact)) {
@@ -157,14 +158,14 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
         LOG.info("download security check for target {} and artifact {} granted", controllerId, localArtifact);
     }
 
-    private LocalArtifact findLocalArtifactByFileResource(final FileResource fileResource) {
+    private org.eclipse.hawkbit.repository.model.Artifact findArtifactByFileResource(final FileResource fileResource) {
         if (fileResource.getSha1() != null) {
-            return artifactManagement.findFirstLocalArtifactsBySHA1(fileResource.getSha1());
+            return artifactManagement.findFirstArtifactBySHA1(fileResource.getSha1());
         } else if (fileResource.getFilename() != null) {
-            return artifactManagement.findLocalArtifactByFilename(fileResource.getFilename()).stream().findFirst()
+            return artifactManagement.findArtifactByFilename(fileResource.getFilename()).stream().findFirst()
                     .orElse(null);
         } else if (fileResource.getArtifactId() != null) {
-            return artifactManagement.findLocalArtifact(fileResource.getArtifactId());
+            return artifactManagement.findArtifact(fileResource.getArtifactId());
         } else if (fileResource.getSoftwareModuleFilenameResource() != null) {
             return artifactManagement
                     .findByFilenameAndSoftwareModule(fileResource.getSoftwareModuleFilenameResource().getFilename(),
@@ -191,7 +192,8 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
         try {
             SecurityContextHolder.getContext().setAuthentication(authenticationManager.doAuthenticate(secruityToken));
 
-            final LocalArtifact localArtifact = findLocalArtifactByFileResource(fileResource);
+            final org.eclipse.hawkbit.repository.model.Artifact localArtifact = findArtifactByFileResource(
+                    fileResource);
 
             if (localArtifact == null) {
                 LOG.info("target {} requested file resource {} which does not exists to download",
@@ -201,7 +203,7 @@ public class AmqpAuthenticationMessageHandler extends BaseAmqpService {
 
             checkIfArtifactIsAssignedToTarget(secruityToken, localArtifact);
 
-            final Artifact artifact = convertDbArtifact(artifactManagement.loadLocalArtifactBinary(localArtifact));
+            final Artifact artifact = convertDbArtifact(artifactManagement.loadArtifactBinary(localArtifact));
             if (artifact == null) {
                 throw new EntityNotFoundException();
             }

hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherService.java

@@ -29,7 +29,6 @@ import org.eclipse.hawkbit.eventbus.EventSubscriber;
 import org.eclipse.hawkbit.repository.SystemManagement;
 import org.eclipse.hawkbit.repository.eventbus.event.CancelTargetAssignmentEvent;
 import org.eclipse.hawkbit.repository.eventbus.event.TargetAssignDistributionSetEvent;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.security.SystemSecurityContext;
 import org.eclipse.hawkbit.util.IpUtil;
@@ -159,12 +158,13 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
         amqpSoftwareModule.setModuleType(softwareModule.getType().getKey());
         amqpSoftwareModule.setModuleVersion(softwareModule.getVersion());
 
-        final List<Artifact> artifacts = convertArtifacts(target, softwareModule.getLocalArtifacts());
+        final List<Artifact> artifacts = convertArtifacts(target, softwareModule.getArtifacts());
         amqpSoftwareModule.setArtifacts(artifacts);
         return amqpSoftwareModule;
     }
 
-    private List<Artifact> convertArtifacts(final Target target, final List<LocalArtifact> localArtifacts) {
+    private List<Artifact> convertArtifacts(final Target target,
+            final List<org.eclipse.hawkbit.repository.model.Artifact> localArtifacts) {
         if (localArtifacts.isEmpty()) {
             return Collections.emptyList();
         }
@@ -173,7 +173,8 @@ public class AmqpMessageDispatcherService extends BaseAmqpService {
                 .collect(Collectors.toList());
     }
 
-    private Artifact convertArtifact(final Target target, final LocalArtifact localArtifact) {
+    private Artifact convertArtifact(final Target target,
+            final org.eclipse.hawkbit.repository.model.Artifact localArtifact) {
         final Artifact artifact = new Artifact();
 
         artifact.setUrls(artifactUrlHandler

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthenticationTest.java

@@ -31,10 +31,10 @@ import org.eclipse.hawkbit.repository.ControllerManagement;
 import org.eclipse.hawkbit.repository.SystemManagement;
 import org.eclipse.hawkbit.repository.TenantConfigurationManagement;
 import org.eclipse.hawkbit.repository.jpa.JpaEntityFactory;
-import org.eclipse.hawkbit.repository.jpa.model.JpaLocalArtifact;
+import org.eclipse.hawkbit.repository.jpa.model.JpaArtifact;
 import org.eclipse.hawkbit.repository.jpa.model.JpaSoftwareModule;
 import org.eclipse.hawkbit.repository.jpa.model.JpaSoftwareModuleType;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
+import org.eclipse.hawkbit.repository.model.Artifact;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TenantConfigurationValue;
 import org.eclipse.hawkbit.repository.model.TenantMetaData;
@@ -154,16 +154,16 @@ public class AmqpControllerAuthenticationTest {
 
         authenticationManager.postConstruct();
 
-        final LocalArtifact testArtifact = new JpaLocalArtifact("afilename", "afilename", new JpaSoftwareModule(
+        final Artifact testArtifact = new JpaArtifact("afilename", "afilename", new JpaSoftwareModule(
                 new JpaSoftwareModuleType("a key", "a name", null, 1), "a name", null, null, null));
 
-        when(artifactManagementMock.findLocalArtifact(ARTIFACT_ID)).thenReturn(testArtifact);
-        when(artifactManagementMock.findFirstLocalArtifactsBySHA1(SHA1)).thenReturn(testArtifact);
+        when(artifactManagementMock.findArtifact(ARTIFACT_ID)).thenReturn(testArtifact);
+        when(artifactManagementMock.findFirstArtifactBySHA1(SHA1)).thenReturn(testArtifact);
 
         final DbArtifact artifact = new DbArtifact();
         artifact.setSize(ARTIFACT_SIZE);
         artifact.setHashes(new DbArtifactHash("sha1 test", "md5 test"));
-        when(artifactManagementMock.loadLocalArtifactBinary(testArtifact)).thenReturn(artifact);
+        when(artifactManagementMock.loadArtifactBinary(testArtifact)).thenReturn(artifact);
 
         amqpMessageHandlerService = new AmqpMessageHandlerService(rabbitTemplate,
                 mock(AmqpMessageDispatcherService.class), controllerManagementMock, new JpaEntityFactory());

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageDispatcherServiceTest.java

@@ -34,7 +34,6 @@ import org.eclipse.hawkbit.repository.eventbus.event.CancelTargetAssignmentEvent
 import org.eclipse.hawkbit.repository.eventbus.event.TargetAssignDistributionSetEvent;
 import org.eclipse.hawkbit.repository.model.Artifact;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.repository.model.Target;
 import org.eclipse.hawkbit.repository.model.TenantMetaData;
@@ -160,8 +159,8 @@ public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {
         final DistributionSet dsA = testdataFactory.createDistributionSet("");
         final SoftwareModule module = dsA.getModules().iterator().next();
         final List<DbArtifact> receivedList = new ArrayList<>();
-        for (final Artifact artifact : testdataFactory.createLocalArtifacts(module.getId())) {
-            module.addArtifact((LocalArtifact) artifact);
+        for (final Artifact artifact : testdataFactory.createArtifacts(module.getId())) {
+            module.addArtifact(artifact);
             receivedList.add(new DbArtifact());
         }
 
@@ -186,8 +185,7 @@ public class AmqpMessageDispatcherServiceTest extends AbstractIntegrationTest {
 
             module.getArtifacts().forEach(dbArtifact -> {
                 final Optional<org.eclipse.hawkbit.dmf.json.model.Artifact> found = softwareModule.getArtifacts()
-                        .stream().filter(dmfartifact -> dmfartifact.getFilename()
-                                .equals(((LocalArtifact) dbArtifact).getFilename()))
+                        .stream().filter(dmfartifact -> dmfartifact.getFilename().equals(dbArtifact.getFilename()))
                         .findFirst();
 
                 assertTrue("The artifact should exist in message", found.isPresent());

hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpMessageHandlerServiceTest.java

@@ -49,7 +49,7 @@ import org.eclipse.hawkbit.repository.jpa.model.JpaTarget;
 import org.eclipse.hawkbit.repository.jpa.model.helper.SecurityTokenGeneratorHolder;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.Action.Status;
-import org.eclipse.hawkbit.repository.model.LocalArtifact;
+import org.eclipse.hawkbit.repository.model.Artifact;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.repository.model.TargetInfo;
 import org.eclipse.hawkbit.repository.model.TargetUpdateStatus;
@@ -300,8 +300,8 @@ public class AmqpMessageHandlerServiceTest {
         final Message message = amqpMessageHandlerService.getMessageConverter().toMessage(securityToken,
                 messageProperties);
 
-        final LocalArtifact localArtifactMock = mock(LocalArtifact.class);
-        when(artifactManagementMock.findFirstLocalArtifactsBySHA1(anyString())).thenReturn(localArtifactMock);
+        final Artifact localArtifactMock = mock(Artifact.class);
+        when(artifactManagementMock.findFirstArtifactBySHA1(anyString())).thenReturn(localArtifactMock);
         when(controllerManagementMock.getActionForDownloadByTargetAndSoftwareModule(anyObject(), anyObject()))
                 .thenThrow(EntityNotFoundException.class);
 
@@ -325,12 +325,12 @@ public class AmqpMessageHandlerServiceTest {
                 messageProperties);
 
         // mock
-        final LocalArtifact localArtifactMock = mock(LocalArtifact.class);
+        final Artifact localArtifactMock = mock(Artifact.class);
         final DbArtifact dbArtifactMock = mock(DbArtifact.class);
-        when(artifactManagementMock.findFirstLocalArtifactsBySHA1(anyString())).thenReturn(localArtifactMock);
+        when(artifactManagementMock.findFirstArtifactBySHA1(anyString())).thenReturn(localArtifactMock);
         when(controllerManagementMock.hasTargetArtifactAssigned(securityToken.getControllerId(), localArtifactMock))
                 .thenReturn(true);
-        when(artifactManagementMock.loadLocalArtifactBinary(localArtifactMock)).thenReturn(dbArtifactMock);
+        when(artifactManagementMock.loadArtifactBinary(localArtifactMock)).thenReturn(dbArtifactMock);
         when(dbArtifactMock.getArtifactId()).thenReturn("artifactId");
         when(dbArtifactMock.getSize()).thenReturn(1L);
         when(dbArtifactMock.getHashes()).thenReturn(new DbArtifactHash("sha1", "md5"));