Switch to /apmg/ namespace

Author: mbtools

.abapgit.xml

@@ -12,7 +12,7 @@
      <MIN_RELEASE>750</MIN_RELEASE>
     </item>
    </REQUIREMENTS>
-   <VERSION_CONSTANT>ZIF_HTTP_AGENT=&gt;C_VERSION</VERSION_CONSTANT>
+   <VERSION_CONSTANT>/APMG/IF_HTTP_AGENT=&gt;C_VERSION</VERSION_CONSTANT>
   </DATA>
  </asx:values>
 </asx:abap>

src/#apmg#.nspc.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<abapGit version="v1.0.0" serializer="LCL_OBJECT_NSPC" serializer_version="v1.0.0">
+ <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
+  <asx:values>
+   <NSPC>
+    <NAMESPACE>/APMG/</NAMESPACE>
+    <REPLICENSE>41813564412598342476</REPLICENSE>
+   </NSPC>
+   <NSPC_TEXT>
+    <SPRAS>E</SPRAS>
+    <DESCRIPTN>apm</DESCRIPTN>
+    <OWNER>apm.to Inc.</OWNER>
+   </NSPC_TEXT>
+  </asx:values>
+ </asx:abap>
+</abapGit>

src/zcl_http_agent.clas.abap renamed to src/#apmg#cl_http_agent.clas.abap

@@ -1,4 +1,4 @@
-CLASS zcl_http_agent DEFINITION
+CLASS /apmg/cl_http_agent DEFINITION
   PUBLIC
   FINAL
   CREATE PRIVATE.
@@ -11,11 +11,11 @@ CLASS zcl_http_agent DEFINITION
 ************************************************************************
   PUBLIC SECTION.
 
-    INTERFACES zif_http_agent.
+    INTERFACES /apmg/if_http_agent.
 
     CLASS-METHODS create
       RETURNING
-        VALUE(result) TYPE REF TO zif_http_agent.
+        VALUE(result) TYPE REF TO /apmg/if_http_agent.
 
     METHODS constructor.
 
@@ -29,13 +29,13 @@ CLASS zcl_http_agent DEFINITION
         request TYPE REF TO if_http_request
         payload TYPE any
       RAISING
-        zcx_error.
+        /apmg/cx_error.
 
 ENDCLASS.
 
 
 
-CLASS zcl_http_agent IMPLEMENTATION.
+CLASS /apmg/cl_http_agent IMPLEMENTATION.
 
 
   METHOD attach_payload.
@@ -50,7 +50,7 @@ CLASS zcl_http_agent IMPLEMENTATION.
       WHEN cl_abap_typedescr=>typekind_char.
         request->set_cdata( |{ payload }| ).
       WHEN OTHERS.
-        RAISE EXCEPTION TYPE zcx_error_text
+        RAISE EXCEPTION TYPE /apmg/cx_error_text
           EXPORTING
             text = |Unexpected payload type { payload_type->absolute_name }|.
     ENDCASE.
@@ -67,19 +67,19 @@ CLASS zcl_http_agent IMPLEMENTATION.
 
   METHOD create.
 
-    result = NEW zcl_http_agent( ).
+    result = NEW /apmg/cl_http_agent( ).
 
   ENDMETHOD.
 
 
-  METHOD zif_http_agent~global_headers.
+  METHOD /apmg/if_http_agent~global_headers.
 
     result = global_headers.
 
   ENDMETHOD.
 
 
-  METHOD zif_http_agent~request.
+  METHOD /apmg/if_http_agent~request.
 
     DATA:
       http_client TYPE REF TO if_http_client,
@@ -119,9 +119,9 @@ CLASS zcl_http_agent IMPLEMENTATION.
       ENDLOOP.
     ENDIF.
 
-    IF method = zif_http_agent=>c_method-post
-      OR method = zif_http_agent=>c_method-put
-      OR method = zif_http_agent=>c_method-patch.
+    IF method = /apmg/if_http_agent=>c_method-post
+      OR method = /apmg/if_http_agent=>c_method-put
+      OR method = /apmg/if_http_agent=>c_method-patch.
       attach_payload(
         request = http_client->request
         payload = payload ).
@@ -149,7 +149,7 @@ CLASS zcl_http_agent IMPLEMENTATION.
           code    = status_code
           message = message ).
 
-      RAISE EXCEPTION TYPE zcx_error_text
+      RAISE EXCEPTION TYPE /apmg/cx_error_text
         EXPORTING
           text = |HTTP error: [{ status_code }] { message }|.
     ENDIF.

src/zcl_http_agent.clas.locals_imp.abap renamed to src/#apmg#cl_http_agent.clas.locals_imp.abap

@@ -2,13 +2,13 @@ CLASS lcl_http_response DEFINITION FINAL.
 
   PUBLIC SECTION.
 
-    INTERFACES zif_http_response.
+    INTERFACES /apmg/if_http_response.
 
     CLASS-METHODS create
       IMPORTING
         http_client   TYPE REF TO if_http_client
       RETURNING
-        VALUE(result) TYPE REF TO zif_http_response.
+        VALUE(result) TYPE REF TO /apmg/if_http_response.
 
   PRIVATE SECTION.
 
@@ -29,32 +29,32 @@ CLASS lcl_http_response IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD zif_http_response~close.
+  METHOD /apmg/if_http_response~close.
 
     http_client->close( ).
 
   ENDMETHOD.
 
-  METHOD zif_http_response~is_ok.
+  METHOD /apmg/if_http_response~is_ok.
 
-    DATA(status_code) = zif_http_response~code( ).
+    DATA(status_code) = /apmg/if_http_response~code( ).
     result = xsdbool( status_code >= 200 AND status_code < 300 ).
 
   ENDMETHOD.
 
-  METHOD zif_http_response~data.
+  METHOD /apmg/if_http_response~data.
 
     result = http_response->get_data( ).
 
   ENDMETHOD.
 
-  METHOD zif_http_response~cdata.
+  METHOD /apmg/if_http_response~cdata.
 
     result = http_response->get_cdata( ).
 
   ENDMETHOD.
 
-  METHOD zif_http_response~code.
+  METHOD /apmg/if_http_response~code.
 
     DATA msg TYPE string ##NEEDED.
 
@@ -65,23 +65,23 @@ CLASS lcl_http_response IMPLEMENTATION.
 
   ENDMETHOD.
 
-  METHOD zif_http_response~json.
+  METHOD /apmg/if_http_response~json.
 
     TRY.
-        result = zcl_ajson=>parse( zif_http_response~cdata( ) ).
+        result = zcl_ajson=>parse( /apmg/if_http_response~cdata( ) ).
       CATCH zcx_ajson_error INTO DATA(error).
-        RAISE EXCEPTION TYPE zcx_error_prev EXPORTING previous = error.
+        RAISE EXCEPTION TYPE /apmg/cx_error_prev EXPORTING previous = error.
     ENDTRY.
 
   ENDMETHOD.
 
-  METHOD zif_http_response~error.
+  METHOD /apmg/if_http_response~error.
 
     result = http_response->get_cdata( ).
 
   ENDMETHOD.
 
-  METHOD zif_http_response~headers.
+  METHOD /apmg/if_http_response~headers.
 
     DATA headers TYPE tihttpnvp.
 

src/zcl_http_agent.clas.xml renamed to src/#apmg#cl_http_agent.clas.xml

@@ -3,7 +3,7 @@
  <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
   <asx:values>
    <VSEOCLASS>
-    <CLSNAME>ZCL_HTTP_AGENT</CLSNAME>
+    <CLSNAME>/APMG/CL_HTTP_AGENT</CLSNAME>
     <LANGU>E</LANGU>
     <DESCRIPT>HTTP Agent</DESCRIPT>
     <STATE>1</STATE>

src/zcl_http_login_manager.clas.abap renamed to src/#apmg#cl_http_login_manager.clas.abap

@@ -1,4 +1,4 @@
-CLASS zcl_http_login_manager DEFINITION
+CLASS /apmg/cl_http_login_manager DEFINITION
   PUBLIC
   FINAL
   CREATE PUBLIC.
@@ -44,6 +44,12 @@ CLASS zcl_http_login_manager DEFINITION
 
     CLASS-DATA auths TYPE TABLE OF ty_auth WITH DEFAULT KEY.
 
+    CLASS-METHODS get_host
+      IMPORTING
+        !host         TYPE string
+      RETURNING
+        VALUE(result) TYPE string.
+
     CLASS-METHODS append
       IMPORTING
         !host TYPE string
@@ -53,14 +59,16 @@ ENDCLASS.
 
 
 
-CLASS zcl_http_login_manager IMPLEMENTATION.
+CLASS /apmg/cl_http_login_manager IMPLEMENTATION.
 
 
   METHOD append.
 
-    IF NOT line_exists( auths[ host = host ] ).
+    DATA(hostname) = get_host( host ).
+
+    IF NOT line_exists( auths[ host = hostname ] ).
       APPEND INITIAL LINE TO auths ASSIGNING FIELD-SYMBOL(<auth>).
-      <auth>-host = host.
+      <auth>-host = hostname.
       <auth>-auth = auth.
     ENDIF.
 
@@ -76,14 +84,31 @@ CLASS zcl_http_login_manager IMPLEMENTATION.
 
   METHOD get.
 
-    READ TABLE auths INTO DATA(auth) WITH KEY host = host.
+    READ TABLE auths INTO DATA(auth) WITH KEY host = get_host( host ).
     IF sy-subrc = 0.
       result = auth-auth.
     ENDIF.
 
   ENDMETHOD.
 
 
+  METHOD get_host.
+
+    " If it's a URL, use host:port, otherwise just take the input
+    TRY.
+        DATA(url) = /apmg/cl_url=>parse( host ).
+
+        result = url->components-host.
+        IF url->components-port IS NOT INITIAL.
+          result = |{ result }:{ url->components-port }|.
+        ENDIF.
+      CATCH /apmg/cx_error.
+        result = host.
+    ENDTRY.
+
+  ENDMETHOD.
+
+
   METHOD save.
 
     IF auth IS NOT INITIAL.
@@ -102,12 +127,10 @@ CLASS zcl_http_login_manager IMPLEMENTATION.
       RETURN.
     ENDIF.
 
-    result = cl_http_utility=>encode_base64( |{ username }:{ password }| ).
-
     IF is_basic = abap_true.
-      result = |Basic { result }|.
+      result = |Basic { cl_http_utility=>encode_base64( |{ username }:{ password }| ) }|.
     ELSE.
-      result = |Bearer { result }|.
+      result = |Bearer { password }|.
     ENDIF.
 
     append( host = host

src/zcl_http_login_manager.clas.testclasses.abap renamed to src/#apmg#cl_http_login_manager.clas.testclasses.abap

@@ -3,67 +3,84 @@ CLASS ltcl_login_manager DEFINITION FOR TESTING RISK LEVEL HARMLESS DURATION SHO
   PRIVATE SECTION.
     CONSTANTS:
       c_username TYPE string VALUE 'Aladdin',
-      c_password TYPE string VALUE 'OpenSesame'.
+      c_password TYPE string VALUE 'OpenSesame',
+      c_token    TYPE string VALUE 'TestToken'.
 
     METHODS:
       setup,
       teardown,
-      encoding FOR TESTING,
-      save FOR TESTING,
-      same_server FOR TESTING.
+      basic_auth FOR TESTING RAISING /apmg/cx_error,
+      bearer_auth FOR TESTING RAISING /apmg/cx_error,
+      save FOR TESTING RAISING /apmg/cx_error,
+      same_server FOR TESTING RAISING /apmg/cx_error.
 
 ENDCLASS.
 
 CLASS ltcl_login_manager IMPLEMENTATION.
 
   METHOD setup.
-    zcl_http_login_manager=>clear( ).
+    /apmg/cl_http_login_manager=>clear( ).
   ENDMETHOD.
 
   METHOD teardown.
-    zcl_http_login_manager=>clear( ).
+    /apmg/cl_http_login_manager=>clear( ).
   ENDMETHOD.
 
   METHOD save.
 
     CONSTANTS c_host TYPE string VALUE 'https://abapgit.org/foo/bar'.
     CONSTANTS c_auth TYPE string VALUE 'foobar'.
 
-    zcl_http_login_manager=>save(
+    /apmg/cl_http_login_manager=>save(
       host = c_host
       auth = c_auth ).
 
     cl_abap_unit_assert=>assert_equals(
-      act = zcl_http_login_manager=>get( c_host )
+      act = /apmg/cl_http_login_manager=>get( c_host )
       exp = c_auth ).
 
   ENDMETHOD.
 
-  METHOD encoding.
+  METHOD basic_auth.
 
-    DATA(auth) = zcl_http_login_manager=>set(
+    DATA(auth) = /apmg/cl_http_login_manager=>set(
       host     = 'https://github.com/abapGit/abapGit.git'
       username = c_username
-      password = c_password ).
+      password = c_password
+      is_basic = abap_true ).
 
     cl_abap_unit_assert=>assert_equals(
       act = auth
       exp = 'Basic QWxhZGRpbjpPcGVuU2VzYW1l' ).
 
   ENDMETHOD.
 
+  METHOD bearer_auth.
+
+    DATA(auth) = /apmg/cl_http_login_manager=>set(
+      host     = 'https://github.com/abapGit/abapGit.git'
+      username = c_username
+      password = c_token
+      is_basic = abap_false ).
+
+    cl_abap_unit_assert=>assert_equals(
+      act = auth
+      exp = |Bearer { c_token }| ).
+
+  ENDMETHOD.
+
   METHOD same_server.
 
     CONSTANTS: c_github1 TYPE string VALUE 'https://github.com/abapGit/abapGit.git',
                c_github2 TYPE string VALUE 'https://github.com/larshp/Foobar.git'.
 
-    zcl_http_login_manager=>set(
+    /apmg/cl_http_login_manager=>set(
       host     = c_github1
       username = c_username
       password = c_password ).
 
-    DATA(auth1) = zcl_http_login_manager=>get( c_github1 ).
-    DATA(auth2) = zcl_http_login_manager=>get( c_github2 ).
+    DATA(auth1) = /apmg/cl_http_login_manager=>get( c_github1 ).
+    DATA(auth2) = /apmg/cl_http_login_manager=>get( c_github2 ).
 
     cl_abap_unit_assert=>assert_equals(
       act = auth1