feat(api) polish access point uri

Author: duhenglucky

openmessaging-api/src/main/java/io/openmessaging/api/internal/AccessPointURI.java

@@ -22,8 +22,8 @@
 import static io.openmessaging.api.OMSResponseStatus.generateException;
 
 /**
- * Represents a <a href="https://github.com/openmessaging/specification/blob/master/oms_access_point_schema.md">AccessPoint String</a>.
- * The Connection String describes the details to connect a specific OMS service provider.
+ * Represents a <a href="https://github.com/openmessaging/specification/blob/master/oms_access_point_schema.md">AccessPoint
+ * String</a>. The Connection String describes the details to connect a specific OMS service provider.
  */
 public class AccessPointURI {
     private static final String PREFIX = "oms:";
@@ -41,9 +41,10 @@ public class AccessPointURI {
      * <p>
      *
      * More details please refer to:
-     * <a href="https://github.com/openmessaging/specification/blob/master/oms_access_point_schema.md">Access Point Schema</a>
+     * <a href="https://github.com/openmessaging/specification/blob/master/oms_access_point_schema.md">Access Point
+     * Schema</a>
      */
-    private static final String PATTERN = "^oms:.+://.+/.+$";
+    private static final String PATTERN = "^oms:.+://.+(/.+)?";
 
     AccessPointURI(String accessPointString) {
         validateAccessPointString(accessPointString);
@@ -58,9 +59,15 @@ public class AccessPointURI {
         unprocessedString = unprocessedString.substring(driverType.length() + 3);
 
         idx = unprocessedString.lastIndexOf('/');
+        String userAndHostInformation;
 
-        this.region = unprocessedString.substring(idx + 1);
-        String userAndHostInformation = unprocessedString.substring(0, idx);
+        if (idx != -1) {
+            this.region = unprocessedString.substring(idx + 1);
+            userAndHostInformation = unprocessedString.substring(0, idx);
+        } else {
+            this.region = null;
+            userAndHostInformation = unprocessedString;
+        }
 
         idx = userAndHostInformation.indexOf('@');
 

openmessaging-api/src/main/java/io/openmessaging/api/internal/MessagingAccessPointAdapter.java

@@ -18,7 +18,6 @@
 package io.openmessaging.api.internal;
 
 import io.openmessaging.api.MessagingAccessPoint;
-import io.openmessaging.api.OMS;
 import io.openmessaging.api.OMSBuiltinKeys;
 import io.openmessaging.api.OMSResponseStatus;
 import io.openmessaging.api.exception.OMSRuntimeException;
@@ -49,14 +48,17 @@ public static MessagingAccessPoint getMessagingAccessPoint(String url, Propertie
 
         attributes.put(OMSBuiltinKeys.ACCESS_POINTS, accessPointURI.getHosts());
         attributes.put(OMSBuiltinKeys.DRIVER_IMPL, driverImpl);
-        attributes.put(OMSBuiltinKeys.REGION, accessPointURI.getRegion());
-        attributes.put(OMSBuiltinKeys.ACCOUNT_ID, accessPointURI.getAccountId());
+        if (accessPointURI.getRegion() != null) {
+            attributes.put(OMSBuiltinKeys.REGION, accessPointURI.getRegion());
+        }
+        if (accessPointURI.getAccountId() != null) {
+            attributes.put(OMSBuiltinKeys.ACCOUNT_ID, accessPointURI.getAccountId());
+        }
 
         try {
             Class<?> driverImplClass = Class.forName(driverImpl);
             Constructor constructor = driverImplClass.getConstructor(Properties.class);
             MessagingAccessPoint vendorImpl = (MessagingAccessPoint) constructor.newInstance(attributes);
-            checkSpecVersion(OMS.specVersion, vendorImpl.version());
             return vendorImpl;
         } catch (Throwable e) {
             throw generateException(OMSResponseStatus.STATUS_10000, url);
@@ -70,16 +72,4 @@ private static String parseDriverImpl(String driverType, Properties attributes)
         return "io.openmessaging." + driverType + ".MessagingAccessPointImpl";
     }
 
-    private static void checkSpecVersion(final String specVersion, final String implVersion) {
-        String majorVerOfImpl;
-        String majorVerOfSpec = specVersion.substring(0, specVersion.indexOf('.', specVersion.indexOf('.') + 1));
-        try {
-            majorVerOfImpl = implVersion.substring(0, implVersion.indexOf('.', implVersion.indexOf('.') + 1));
-        } catch (Throwable e) {
-            throw generateException(OMSResponseStatus.STATUS_10002, implVersion);
-        }
-        if (!majorVerOfSpec.equals(majorVerOfImpl)) {
-            throw generateException(OMSResponseStatus.STATUS_10003, implVersion, specVersion);
-        }
-    }
 }

openmessaging-api/src/test/java/io/openmessaging/api/internal/AccessPointURITest.java

@@ -37,12 +37,12 @@ public void testParse_DriverIsIllegal() {
         }
 
 
-        String missRegion = "oms:rocketmq://alice@rocketmq.apache.org/";
+        String missHost = "oms:rocketmq://";
         try {
-            new AccessPointURI(missRegion);
+            new AccessPointURI(missHost);
             failBecauseExceptionWasNotThrown(OMSRuntimeException.class);
         } catch (Exception e) {
-            assertThat(e).hasMessageContaining(String.format("The OMS driver URL [%s] is illegal.", missRegion));
+            assertThat(e).hasMessageContaining(String.format("The OMS driver URL [%s] is illegal.", missHost));
         }
     }