fixed support for URLS-file.

npo-poms · Jun 4, 2024 · be352f4 · be352f4
1 parent cf9dcd5
commit be352f4
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/media-backend-api-client/pom.xml b/media-backend-api-client/pom.xml
@@ -55,12 +55,16 @@
       <groupId>nl.vpro.shared</groupId>
       <artifactId>vpro-shared-rs</artifactId>
     </dependency>
-      <!-- optional? re3/re4?
-      <dependency>
-        <groupId>org.jboss.resteasy</groupId>
-        <artifactId>resteasy-client-api</artifactId>
-      </dependency>
-      -->
+    <dependency>
+      <groupId>nl.vpro.poms.api-clients</groupId>
+      <artifactId>client-core</artifactId>
+    </dependency>
+    <!-- optional? re3/re4?
+    <dependency>
+      <groupId>org.jboss.resteasy</groupId>
+      <artifactId>resteasy-client-api</artifactId>
+    </dependency>
+    -->
 
   </dependencies>
 

diff --git a/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java b/media-backend-api-client/src/main/java/nl/vpro/api/client/media/MediaRestClient.java
@@ -28,6 +28,7 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 
 import nl.vpro.api.client.resteasy.AbstractApiClient;
+import nl.vpro.api.client.utils.Config;
 import nl.vpro.api.rs.subtitles.*;
 import nl.vpro.domain.media.*;
 import nl.vpro.domain.media.search.*;
@@ -44,6 +45,7 @@
 import nl.vpro.rs.media.MediaBackendRestService;
 import nl.vpro.util.*;
 
+import static nl.vpro.api.client.utils.Config.URLS_FILE;
 import static nl.vpro.domain.media.EntityType.AllMedia.valueOf;
 import static nl.vpro.domain.media.search.Pager.Direction.ASC;
 
@@ -345,7 +347,9 @@ public static Builder configured(Env env, String... configFiles) {
      */
     public static Builder configured(Env env) {
         Builder builder = builder();
-        ConfigUtils.configuredInHome(env, builder, "mediarestclient.properties", "creds.properties");
+        Config  config = new Config(URLS_FILE, "mediarestclient.properties");
+        config.setEnv(env);
+        ReflectionUtils.configured(builder, config.getProperties(Config.Prefix.media_api_backend));
         return builder;
     }