#48 - Fix for use of generated client in src/test - updated avaje-http-client-generator

Supports suffix of $HttpClient and HttpClient, removing the $ to better support use in src/test

Author: rbygrave

client/pom.xml

@@ -37,14 +37,14 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-slf4j-jpl</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>junit</artifactId>
-      <version>1.0</version>
+      <version>1.1</version>
       <scope>test</scope>
     </dependency>
 

client/src/main/java/io/avaje/http/client/DHttpClientContext.java

@@ -63,21 +63,29 @@ public <T> T create(Class<T> clientInterface) {
     if (apiProvider != null) {
       return apiProvider.provide(this);
     }
-    String implClassName = clientImplementationClassName(clientInterface);
     try {
-      Class<?> serviceClass = Class.forName(implClassName);
-      Constructor<?> constructor = serviceClass.getConstructor(HttpClientContext.class);
-      Object service = constructor.newInstance(this);
-      return (T) service;
+      Class<?> implementationClass = implementationClass(clientInterface);
+      Constructor<?> constructor = implementationClass.getConstructor(HttpClientContext.class);
+      return (T) constructor.newInstance(this);
     } catch (Exception e) {
-      throw new IllegalStateException("Failed to create http client service " + implClassName, e);
+      String cn = implementationClassName(clientInterface, "HttpClient");
+      throw new IllegalStateException("Failed to create http client service " + cn, e);
     }
   }
 
-  private <T> String clientImplementationClassName(Class<T> clientInterface) {
+  private Class<?> implementationClass(Class<?> clientInterface) throws ClassNotFoundException {
+    try {
+      return Class.forName(implementationClassName(clientInterface, "HttpClient"));
+    } catch (ClassNotFoundException e) {
+      // try the older generated client suffix
+      return Class.forName(implementationClassName(clientInterface, "$HttpClient"));
+    }
+  }
+
+  private <T> String implementationClassName(Class<T> clientInterface, String suffix) {
     String packageName = clientInterface.getPackageName();
     String simpleName = clientInterface.getSimpleName();
-    return packageName + ".httpclient." + simpleName + "$HttpClient";
+    return packageName + ".httpclient." + simpleName + suffix;
   }
 
   @Override