add an architecture to the repository source

Author: andponlin

haikudepotserver-api1/src/main/java/org/haiku/haikudepotserver/api1/model/repository/GetRepositoryResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018, Andrew Lindesay
+ * Copyright 2014-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -58,6 +58,12 @@ public static class RepositorySource {
 
         public Long lastImportTimestamp;
 
+        /**
+         * @since 2022-03-12
+         */
+
+        public String architectureCode;
+
     }
 
 }

haikudepotserver-api1/src/main/java/org/haiku/haikudepotserver/api1/model/repository/GetRepositorySourceResult.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020, Andrew Lindesay
+ * Copyright 2015-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -53,6 +53,12 @@ public class GetRepositorySourceResult {
 
     public List<RepositorySourceMirror> repositorySourceMirrors;
 
+    /**
+     * @since 2022-03-12
+     */
+
+    public String architectureCode;
+
     public static class RepositorySourceMirror {
 
         public Boolean active;

haikudepotserver-core-test/src/main/java/org/haiku/haikudepotserver/IntegrationTestSupportService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -160,6 +160,7 @@ public StandardTestData createStandardTestData() {
         result.repositorySource.setCode("testreposrc_xyz");
         result.repositorySource.setRepository(result.repository);
         result.repositorySource.setIdentifier("http://www.example.com/test/identifier/url");
+        result.repositorySource.setArchitecture(x86_64);
 
         RepositorySourceExtraIdentifier repositorySourceExtraIdentifier = context.newObject(RepositorySourceExtraIdentifier.class);
         repositorySourceExtraIdentifier.setIdentifier("example:haiku:identifier");

haikudepotserver-core-test/src/test/java/org/haiku/haikudepotserver/api1/RepositoryApiIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -132,7 +132,7 @@ public void setupSourceBasedUrlTest() {
     }
 
     @Test
-    public void getRepositoryTest() throws Exception {
+    public void getRepositoryTest() {
         integrationTestSupportService.createStandardTestData();
 
         GetRepositoryRequest request = new GetRepositoryRequest();
@@ -151,10 +151,11 @@ public void getRepositoryTest() throws Exception {
         Assertions.assertThat(repositorySource.code).isEqualTo("testreposrc_xyz");
         Assertions.assertThat(repositorySource.active).isTrue();
         Assertions.assertThat(repositorySource.url).startsWith("file:///");
+        Assertions.assertThat(repositorySource.architectureCode).isEqualTo("x86_64");
     }
 
     @Test
-    public void testCreateRepository_ok() throws Exception {
+    public void testCreateRepository_ok() {
         setAuthenticatedUserToRoot();
 
         CreateRepositoryRequest request = new CreateRepositoryRequest();
@@ -175,7 +176,7 @@ public void testCreateRepository_ok() throws Exception {
     }
 
     @Test
-    public void testCreateRepository_codeNotUnique() throws Exception {
+    public void testCreateRepository_codeNotUnique() {
         IntegrationTestSupportService.StandardTestData data = integrationTestSupportService.createStandardTestData();
         setAuthenticatedUserToRoot();
 
@@ -198,7 +199,7 @@ public void testCreateRepository_codeNotUnique() throws Exception {
     }
 
     @Test
-    public void testGetRepositorySource() throws Exception {
+    public void testGetRepositorySource() {
         IntegrationTestSupportService.StandardTestData data = integrationTestSupportService.createStandardTestData();
 
         GetRepositorySourceRequest request = new GetRepositorySourceRequest();
@@ -214,6 +215,7 @@ public void testGetRepositorySource() throws Exception {
         Assertions.assertThat(result.identifier).isEqualTo("http://www.example.com/test/identifier/url");
         Assertions.assertThat(result.repositorySourceMirrors.size()).isEqualTo(2);
         Assertions.assertThat(result.extraIdentifiers).containsExactly("example:haiku:identifier");
+        Assertions.assertThat(result.architectureCode).isEqualTo("x86_64");
 
         GetRepositorySourceResult.RepositorySourceMirror mirror0 = result.repositorySourceMirrors.get(0);
         GetRepositorySourceResult.RepositorySourceMirror mirror1 = result.repositorySourceMirrors.get(1);
@@ -226,7 +228,7 @@ public void testGetRepositorySource() throws Exception {
     }
 
     @Test
-    public void testUpdateRepositorySource() throws Exception {
+    public void testUpdateRepositorySource() {
         integrationTestSupportService.createStandardTestData();
         setAuthenticatedUserToRoot();
 
@@ -254,7 +256,7 @@ public void testUpdateRepositorySource() throws Exception {
     }
 
     @Test
-    public void testCreateRepositorySource() throws Exception {
+    public void testCreateRepositorySource() {
         integrationTestSupportService.createStandardTestData();
         setAuthenticatedUserToRoot();
 
@@ -278,7 +280,7 @@ public void testCreateRepositorySource() throws Exception {
     }
 
     @Test
-    public void testCreateRepositorySourceMirror() throws Exception {
+    public void testCreateRepositorySourceMirror() {
         integrationTestSupportService.createStandardTestData();
         setAuthenticatedUserToRoot();
 
@@ -303,7 +305,7 @@ public void testCreateRepositorySourceMirror() throws Exception {
     }
 
     @Test
-    public void testUpdateRepositorySourceMirror() throws Exception {
+    public void testUpdateRepositorySourceMirror() {
         integrationTestSupportService.createStandardTestData();
         setAuthenticatedUserToRoot();
 
@@ -343,7 +345,7 @@ public void testUpdateRepositorySourceMirror() throws Exception {
     }
 
     @Test
-    public void testGetRepositorySourceMirror() throws Exception {
+    public void testGetRepositorySourceMirror() {
         integrationTestSupportService.createStandardTestData();
 
         GetRepositorySourceMirrorRequest request = new GetRepositorySourceMirrorRequest();
@@ -360,7 +362,7 @@ public void testGetRepositorySourceMirror() throws Exception {
     }
 
     @Test
-    public void testRemoveRepositorySourceMirror() throws Exception {
+    public void testRemoveRepositorySourceMirror() {
         integrationTestSupportService.createStandardTestData();
 
         RemoveRepositorySourceMirrorRequest request = new RemoveRepositorySourceMirrorRequest();

haikudepotserver-core-test/src/test/java/org/haiku/haikudepotserver/repository/RepositoryHpkrIngressServiceIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -225,6 +225,8 @@ public void testImportThenCheck() throws Exception {
                 RepositorySource repositorySource = RepositorySource.tryGetByCode(context, "testsrc_xyz").get();
                 Assertions.assertThat(repositorySource.getIdentifier()).isEqualTo("f0c086e5-e096-429c-b38d-57beabd764e9");
                 // ^^ as defined in the repo info file.
+                Assertions.assertThat(repositorySource.getArchitecture().getCode()).isEqualTo("x86_gcc2");
+                // ^^ as defined in the repo info file.
             }
 
             // now pull out some known packages and make sure they are imported correctly.

haikudepotserver-core-test/src/test/java/org/haiku/haikudepotserver/repository/job/RepositoryDumpExportJobRunnerIT.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -59,7 +59,7 @@ public void testRun() throws IOException {
 
         jobService.awaitJobFinishedUninterruptibly(guid, 10000);
         Optional<? extends JobSnapshot> snapshotOptional = jobService.tryGetJob(guid);
-        Assert.assertEquals(snapshotOptional.get().getStatus(), JobSnapshot.Status.FINISHED);
+        Assertions.assertThat(snapshotOptional.get().getStatus()).isEqualTo(JobSnapshot.Status.FINISHED);
 
         // pull in the ZIP file now and extract the data
 
@@ -85,6 +85,9 @@ public void testRun() throws IOException {
             JsonNode repositorySourceIdentifier = rootNode.at("/items/0/repositorySources/0/identifier");
             Assert.assertThat(repositorySourceIdentifier.asText(), CoreMatchers.is("http://www.example.com/test/identifier/url"));
 
+            JsonNode architectureCode = rootNode.at("/items/0/repositorySources/0/architectureCode");
+            Assertions.assertThat(architectureCode.asText()).isEqualTo("x86_64");
+
             JsonNode mirror0CountryCode = rootNode.at("/items/0/repositorySources/0/repositorySourceMirrors/0/countryCode");
             Assert.assertThat(mirror0CountryCode.asText(), CoreMatchers.is("ZA"));
             JsonNode mirror0BaseUrl = rootNode.at("/items/0/repositorySources/0/repositorySourceMirrors/0/baseUrl");

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/api1/RepositoryApiImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2021, Andrew Lindesay
+ * Copyright 2018-2022, Andrew Lindesay
  * Distributed under the terms of the MIT License.
  */
 
@@ -16,11 +16,41 @@
 import org.apache.commons.collections4.SetUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.haiku.haikudepotserver.api1.model.repository.*;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositoryRequest;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositoryResult;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositorySourceMirrorRequest;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositorySourceMirrorResult;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositorySourceRequest;
+import org.haiku.haikudepotserver.api1.model.repository.CreateRepositorySourceResult;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositoriesRequest;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositoriesResult;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositoryRequest;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositoryResult;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositorySourceMirrorRequest;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositorySourceMirrorResult;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositorySourceRequest;
+import org.haiku.haikudepotserver.api1.model.repository.GetRepositorySourceResult;
+import org.haiku.haikudepotserver.api1.model.repository.RemoveRepositorySourceMirrorRequest;
+import org.haiku.haikudepotserver.api1.model.repository.RemoveRepositorySourceMirrorResult;
+import org.haiku.haikudepotserver.api1.model.repository.SearchRepositoriesRequest;
+import org.haiku.haikudepotserver.api1.model.repository.SearchRepositoriesResult;
+import org.haiku.haikudepotserver.api1.model.repository.TriggerImportRepositoryRequest;
+import org.haiku.haikudepotserver.api1.model.repository.TriggerImportRepositoryResult;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositoryRequest;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositoryResult;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositorySourceMirrorRequest;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositorySourceMirrorResult;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositorySourceRequest;
+import org.haiku.haikudepotserver.api1.model.repository.UpdateRepositorySourceResult;
 import org.haiku.haikudepotserver.api1.support.ObjectNotFoundException;
 import org.haiku.haikudepotserver.api1.support.ValidationException;
 import org.haiku.haikudepotserver.api1.support.ValidationFailure;
-import org.haiku.haikudepotserver.dataobjects.*;
+import org.haiku.haikudepotserver.dataobjects.Architecture;
+import org.haiku.haikudepotserver.dataobjects.Country;
+import org.haiku.haikudepotserver.dataobjects.Repository;
+import org.haiku.haikudepotserver.dataobjects.RepositorySource;
+import org.haiku.haikudepotserver.dataobjects.RepositorySourceExtraIdentifier;
+import org.haiku.haikudepotserver.dataobjects.RepositorySourceMirror;
 import org.haiku.haikudepotserver.dataobjects.auto._RepositorySourceMirror;
 import org.haiku.haikudepotserver.job.model.JobService;
 import org.haiku.haikudepotserver.job.model.JobSnapshot;
@@ -29,7 +59,6 @@
 import org.haiku.haikudepotserver.repository.model.RepositorySearchSpecification;
 import org.haiku.haikudepotserver.repository.model.RepositoryService;
 import org.haiku.haikudepotserver.security.model.Permission;
-import org.haiku.haikudepotserver.security.model.UserAuthenticationService;
 import org.haiku.haikudepotserver.support.SingleCollector;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +67,12 @@
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 @Component("repositoryApiImplV1")
@@ -49,19 +83,16 @@ public class RepositoryApiImpl extends AbstractApiImpl implements RepositoryApi
 
     private final ServerRuntime serverRuntime;
     private final PermissionEvaluator permissionEvaluator;
-    private final UserAuthenticationService userAuthenticationService;
     private final RepositoryService repositoryService;
     private final JobService jobService;
 
     public RepositoryApiImpl(
             ServerRuntime serverRuntime,
             PermissionEvaluator permissionEvaluator,
-            UserAuthenticationService userAuthenticationService,
             RepositoryService repositoryService,
             JobService jobService) {
         this.serverRuntime = Preconditions.checkNotNull(serverRuntime);
         this.permissionEvaluator = Preconditions.checkNotNull(permissionEvaluator);
-        this.userAuthenticationService = Preconditions.checkNotNull(userAuthenticationService);
         this.repositoryService = Preconditions.checkNotNull(repositoryService);
         this.jobService = Preconditions.checkNotNull(jobService);
     }
@@ -237,6 +268,9 @@ public GetRepositoryResult getRepository(GetRepositoryRequest getRepositoryReque
                     resultRs.code = rs.getCode();
                     resultRs.url = rs.tryGetPrimaryMirror().map(_RepositorySourceMirror::getBaseUrl).orElse(null);
                     resultRs.identifier = rs.getIdentifier();
+                    resultRs.architectureCode = Optional.ofNullable(rs.getArchitecture())
+                            .map(Architecture::getCode)
+                            .orElse(null);
 
                     if (null != rs.getLastImportTimestamp()) {
                         resultRs.lastImportTimestamp = rs.getLastImportTimestamp().getTime();
@@ -394,6 +428,9 @@ public GetRepositorySourceResult getRepositorySource(
         result.code = repositorySource.getCode();
         result.repositoryCode = repositorySource.getRepository().getCode();
         result.identifier = repositorySource.getIdentifier();
+        result.architectureCode = Optional.ofNullable(repositorySource.getArchitecture())
+                .map(Architecture::getCode)
+                .orElse(null);
 
         if (null != repositorySource.getLastImportTimestamp()) {
             result.lastImportTimestamp = repositorySource.getLastImportTimestamp().getTime();

haikudepotserver-core/src/main/java/org/haiku/haikudepotserver/dataobjects/auto/_Architecture.java

@@ -1,5 +1,9 @@
 package org.haiku.haikudepotserver.dataobjects.auto;
 
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+
 import org.apache.cayenne.exp.Property;
 import org.haiku.haikudepotserver.dataobjects.support.AbstractDataObject;
 
@@ -17,8 +21,61 @@ public abstract class _Architecture extends AbstractDataObject {
 
     public static final Property<String> CODE = Property.create("code", String.class);
 
+    protected String code;
+
+
     public String getCode() {
-        return (String)readProperty("code");
+        beforePropertyRead("code");
+        return this.code;
+    }
+
+    @Override
+    public Object readPropertyDirectly(String propName) {
+        if(propName == null) {
+            throw new IllegalArgumentException();
+        }
+
+        switch(propName) {
+            case "code":
+                return this.code;
+            default:
+                return super.readPropertyDirectly(propName);
+        }
+    }
+
+    @Override
+    public void writePropertyDirectly(String propName, Object val) {
+        if(propName == null) {
+            throw new IllegalArgumentException();
+        }
+
+        switch (propName) {
+            case "code":
+                this.code = (String)val;
+                break;
+            default:
+                super.writePropertyDirectly(propName, val);
+        }
+    }
+
+    private void writeObject(ObjectOutputStream out) throws IOException {
+        writeSerialized(out);
+    }
+
+    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        readSerialized(in);
+    }
+
+    @Override
+    protected void writeState(ObjectOutputStream out) throws IOException {
+        super.writeState(out);
+        out.writeObject(this.code);
+    }
+
+    @Override
+    protected void readState(ObjectInputStream in) throws IOException, ClassNotFoundException {
+        super.readState(in);
+        this.code = (String)in.readObject();
     }
 
 }