LocalSolver GUI: Fixing Hostname Entry Update API (#656)

Author: mageddo

Dockerfile.builder.linux-amd64-static

@@ -5,7 +5,6 @@ RUN apt-get update -y && \
     build-essential \
     musl musl-dev musl-tools \
     zlib1g-dev \
-    zlib1g-dev-musl \
     curl ca-certificates \
   && ln -sf /usr/bin/musl-gcc /usr/local/bin/x86_64-linux-musl-gcc \
   && rm -rf /var/lib/apt/lists/*
@@ -14,6 +13,13 @@ RUN musl-gcc -v
 ENV CC=/usr/bin/musl-gcc
 ENV GRAALVM_URL='https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-21.0.2/graalvm-community-jdk-21.0.2_linux-x64_bin.tar.gz'
 
+RUN cd / && curl -L -o zlib.tar.gz https://www.zlib.net/fossils/zlib-1.2.11.tar.gz && \
+    mkdir zlib && tar -xvzf zlib.tar.gz -C zlib --strip-components 1 && \
+    cd /zlib && ./configure --static --prefix=/usr/x86_64-linux-musl && \
+    make && make install && \
+    cp -v /usr/x86_64-linux-musl/lib/libz.a /usr/lib/x86_64-linux-musl/ &&\
+    rm -rf /zlib && rm -f /zlib.tar.gz
+
 RUN mkdir /graalvm &&\
   curl -L $GRAALVM_URL > /tmp/graalvm.tgz &&\
   tar --strip 1 -zxvf /tmp/graalvm.tgz -C /graalvm &&\

RELEASE-NOTES.md

@@ -1,6 +1,7 @@
-## 5.0.3
+## 5.0.4
 * Refactoring Linux amd64 static build to work on Github Actions
 * Creating the docs for config v3
+* Fixing Hostname Entry Update API
 
 ## 5.0.0
 * Refactoring config module to support config v3

gradle.properties

@@ -1 +1 @@
-version=5.0.3-snapshot
+version=5.0.4-snapshot

src/main/java/com/mageddo/dnsproxyserver/config/configurer/di/Context.java

@@ -7,6 +7,7 @@
 import com.mageddo.dnsproxyserver.config.configurer.ModuleConfigDAO;
 import com.mageddo.dnsproxyserver.config.configurer.ModuleV2ConfigDAO;
 import com.mageddo.dnsproxyserver.config.configurer.ModuleV3ConfigDAO;
+import com.mageddo.dnsproxyserver.config.dataformat.v3.file.ConfigFileDAO;
 import com.mageddo.dnsproxyserver.config.dataformat.v3.file.ConfigFilePathDAO;
 import com.mageddo.dnsproxyserver.version.configurer.dagger.ModuleVersionConfigurer;
 
@@ -28,4 +29,6 @@ static Context create() {
   ConfigService configService();
 
   ConfigFilePathDAO configFilePathDAO();
+
+  ConfigFileDAO confFigFileDAO();
 }

src/main/java/com/mageddo/dnsproxyserver/config/dataformat/v2/jsonv1v2/dataprovider/MutableConfigDAOJson.java

@@ -73,11 +73,11 @@ private static Env replaceEntry(Env env, Config.Entry entry) {
         .build();
   }
 
-  private static List<Config.Entry> replaceEntry(
+  static List<Config.Entry> replaceEntry(
       List<Config.Entry> entries, Config.Entry entry
   ) {
-    final var store = keyBy(entries, Config.Entry::getId);
-    store.put(entry.getId(), entry);
+    final var store = keyBy(entries, Config.Entry::getHostname);
+    store.put(entry.getHostname(), entry);
     return new ArrayList<>(store.values());
   }
 

src/main/java/com/mageddo/dnsproxyserver/config/mapper/ConfigMapper.java

@@ -1,9 +1,12 @@
 package com.mageddo.dnsproxyserver.config.provider.jsonv1v2.dataprovider;
 
 import com.mageddo.dnsproxyserver.config.Config.Entry.Type;
-import com.mageddo.dnsproxyserver.config.dataformat.v2.jsonv1v2.dataprovider.MutableConfigDAOJson;
+import com.mageddo.dnsproxyserver.config.application.Configs;
+import com.mageddo.dnsproxyserver.config.dataformat.v3.file.MutableConfigDAOFile;
 import com.mageddo.dnsproxyserver.solver.HostnameQuery;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -19,11 +22,19 @@
 import static testing.templates.EnvTemplates.MAGEDDO_COM_CAMEL_CASE;
 
 @ExtendWith(MockitoExtension.class)
-class MutableConfigDAOJsonTest {
+class MutableConfigDAOFileTest {
 
   @Spy
   @InjectMocks
-  MutableConfigDAOJson dao;
+  MutableConfigDAOFile dao;
+
+  @AfterEach
+  @BeforeEach
+  void beforeEach() {
+    Configs.getContext()
+        .confFigFileDAO()
+        .delete();
+  }
 
   @Test
   void mustDoCaseInsensitiveFind() {