3821c.4384k.patch

src/com/goldencode/p2j/oo/core/LegacyString.java 2021-05-21 12:43:12 +0000
13	13	** CA 20210113 Renamed trim() to trim_(), to follow NameConverter's rules.
14	14	** 006 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
15	15	** signature.
	16	** 007 ME 20210520 Set hashCode to return the actual string hashCode.
16	17	*/
17	18
18	19	/*
...	...
680	681	}));
681	682	}
682	683
	684	@Override
683	685	public int hashCode()
684	686	{
685		return this.value.hashCode();
	687	return this.value.toStringMessage().hashCode();
686	688	}
687	689
688	690	}

     ** 003 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 004 ME  20210325 Increment/decrement object references (key/value) when added/removed.
     **     ME  20210521 Use a 'key' object with hashCode/equals overrides.
     */
     /*
-...
     import static com.goldencode.p2j.util.BlockManager.*;
     import static com.goldencode.p2j.util.InternalEntry.Type;
     import java.lang.reflect.InvocationHandler;
     import java.lang.reflect.Method;
     import java.lang.reflect.Proxy;
     import java.util.HashMap;
     import java.util.LinkedHashMap;
     import java.util.Map;
-...
     public class LegacyMap extends BaseObject implements com.goldencode.p2j.oo.core.collections.Imap
+    {
        private HashMap<object, object> map = new LinkedHashMap<object, object>();
        // 4GL BUG, size not reset on clear
        private int size = 0;
-...
           return function(LegacyMap.class, this, "ContainsKey", logical.class, new Block((Body) () ->
+          {
                       returnNormal(new logical(map.containsKey(poKey)));
                    }));
              returnNormal(new logical(map.containsKey(new keyobject(poKey))));
           }));
+       }
        @LegacySignature(returns = "LOGICAL", type = Type.METHOD, name = "ContainsAllKeys", parameters = {
-...
           return function(LegacyMap.class, this, "Get", object.class, new Block((Body) () ->
+          {
              if (map.containsKey(poKey))
                 returnNormal(map.get(poKey));
              keyobject key = new keyobject(poKey);
              if (map.containsKey(key))
                 returnNormal(map.get(key));
              returnNormal(new object());
           }));
-...
              if (poKey.ref().equals(this))
                 undoThrow(AppError.newInstance(new character("A Map cannot have itself as key.")));
              ObjectOps.increment(poKey.ref());
              if (poValue._isValid())
+             {
                 ObjectOps.increment(poValue.ref());
+             }
              object obj = map.put(poKey, poValue);
              object obj = map.put(new keyobject(poKey), poValue);
              if (obj == null)
              if (obj == null)
+             {
                 ObjectOps.increment(poKey.ref());
                 size++;
+             }
              returnNormal(obj != null ? obj : new object());
           }));
-...
+       {
           return map;
+       }
        class keyobject extends object {
           public keyobject(object other)
+          {
              super(other);
+          }
           @Override
           public int hashCode()
+          {
              return _isValid() ? ref.hashCode() : 0;
+          }
           @Override
           public boolean equals(Object obj)
+          {
              if (obj instanceof object)
+             {
                 object other = (object) obj;
                 return _isValid() ? ref.legacyEquals(other).booleanValue() : !other._isValid();
+             }
              return false;
+          }
+       }
+    }

     **     CA  20210216 Methods which have an int parameter must use the BlockManager API for top-level block.
     ** 004 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 005 ME  20210507 Improve parameter validation (call syntax uses '-' as separator instead space).
     */
     /*
-...
     package com.goldencode.p2j.oo.lang;
     import static com.goldencode.p2j.util.BlockManager.*;
     import com.goldencode.p2j.persist.DataSetParameter;
     import static com.goldencode.p2j.report.ReportConstants.*;
     import com.goldencode.p2j.util.*;
-...
                 ErrorManager.recordOrThrowError(15295, "Unusable datatype for SetParameter method.", false);
+             }
              CallMode cmode = CallMode.buildMode(mode);
              if (cmode == null)
              // space is used as separator instead of '-' for call, trailing spaces are allowed
              CallMode cmode = CallMode.buildMode(TextOps.replaceAll(TextOps.rightTrim(mode), " ", "-"));
              if (!validCallMode(cmode, type.getValue(), val))
+             {
                 String msg = "SetParameter IOmode parameter is required in the overload"
                          + " being used, and should be 'INPUT', 'OUTPUT', 'INPUT-OUTPUT'"
-...
              if (!cmode.input && !Call.validOutputParameter(pos.intValue(), val))
+             {
                 returnNormal(new logical(false));
                 ErrorManager.recordOrThrowError(15311,
                          "SetParameter value for OUTPUT parameters may not be a function or any expression unsuitable for output, nor a database field.",
                          false);
+             }
              CallParameter param = Call.createParameter(type.getValue(), cmode, val, false, true);
-...
           }));
+       }
        private boolean validCallMode(CallMode cmode, String type, Object val)
+       {
           if (cmode != null)
+          {
              if (val instanceof BaseDataTypeVariable)
+             {
                 val = ((BaseDataTypeVariable) val).get();
+             }
              boolean needDataStructure = false;
              switch (cmode.mode)
+             {
                 // by-value is not accepted although it's default
                 case BY_VALUE:
                    return false;
                 case BIND:
                    if (cmode.inputOutput)
                       return false;
                 case BY_REFERENCE:
                    if (cmode.append)
                       return false;
                    needDataStructure = true;
+             }
              needDataStructure = needDataStructure || cmode.append;
              if (needDataStructure)
                 return ("TABLE".equalsIgnoreCase(type) || "TABLE-HANDLE".equalsIgnoreCase(type)
                          || "DATASET".equalsIgnoreCase(type)
                          || "DATASET-HANDLE".equalsIgnoreCase(type))
                          && (val instanceof TableParameter || val instanceof DataSetParameter
                                   || val instanceof handle);
              return true;
+          }
           return false;
+       }
        /**
         * Get the argument modes.
+        *

     ** 002 CA  20210113 Renamed clear() to clear_(), to follow NameConverter's rules.
     ** 003 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 004 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
     import java.util.ArrayList;
     import java.util.HashMap;
     import java.util.HashSet;
     import java.util.List;
     import java.util.Map.Entry;
     import java.util.Set;
     /**
-...
           return function(FileTypeRegistry.class, "Registry", object.class, new Block((Body) () ->
+          {
              if(registry.get().isUnknown())
              if(!registry.get()._isValid())
+             {
                 object<? extends FileTypeRegistry> oFTR = ObjectOps.newInstance(FileTypeRegistry.class);
                 initMap(oFTR);
                 registry.set(oFTR);
                 registry.get().assign(ObjectOps.newInstance(FileTypeRegistry.class));
                 initMap(registry.get());
+             }
              returnNormal(registry.get());
           }));

     ** 004 ME  20200410 Complete implementation as of OE 11.7.4.
     ** 005 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 006 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
                 final object<? extends com.goldencode.p2j.oo.net.http.IhttpClient> p2)
+       {
           object<? extends com.goldencode.p2j.oo.lang.LegacyClass> _p1 = TypeFactory.initInput(p1);
           object<? extends _BaseObject_> client = TypeFactory.object(IhttpClient.class);
           return function(ClientBuilder.class, "DecorateClient", object.class,  new Block((Body) () -> {
              object<? extends LegacyClass> decoratorType = ObjectOps.newInstance(LegacyClass.class);
-...
              else {
                 Assert.isType(decoratorType, ObjectOps.getLegacyClass(HttpClientDecorator.class));
                 object<? extends _BaseObject_> client = ObjectOps
                          .newInstance(decoratorType.ref().getType(), "I", p2);
                 client.assign(ObjectOps.newInstance(decoratorType.ref().getType(), "I", p2));
                 if (!client.isUnknown() && client.ref() instanceof ISupportInitialize)
                    ((ISupportInitialize) client.ref()).initialize();
-...
+       {
           return function(null, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = ClientBuilder.registry.get();
              if (!registry.isValid().booleanValue()) {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class));
                 initializeRegistry(registry);
              if (!registry.get().isValid().booleanValue()) {
                 registry.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
                 initializeRegistry(registry.get());
+             }
              returnNormal(registry);
              returnNormal(registry.get());
           }));
+       }

     ** 004 ME   20201028 Implement missing methods as of OE12.2.
     ** 005 CA   20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                   signature.
     ** 006 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
+       {
           return function(null, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> oRegistry = CookieJarBuilder.registry.get();
              if(!oRegistry._isValid())
              if(!registry.get()._isValid())
+             {
                 oRegistry.assign(ObjectOps.newInstance(BuilderRegistry.class));
                 registry.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
                 oRegistry.ref().put(new character(ObjectOps.getLegacyName(CookieJarBuilder.class)),
                 registry.get().ref().put(new character(ObjectOps.getLegacyName(CookieJarBuilder.class)),
                          ObjectOps.getLegacyClass(DefaultCookieJarBuilder.class));
                 oRegistry.ref().put(new character(ObjectOps.getLegacyName(ICookieJar.class)),
                 registry.get().ref().put(new character(ObjectOps.getLegacyName(ICookieJar.class)),
                          ObjectOps.getLegacyClass(CookieJar.class));
+             }
              returnNormal(oRegistry);
              returnNormal(registry.get());
           }));
+       }
-...
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        public static object<? extends com.goldencode.p2j.oo.net.http.CookieJarBuilder> build()
+       {
           object<? extends CookieJarBuilder> oCJB = TypeFactory.object(CookieJarBuilder.class);
           return function(CookieJarBuilder.class, "Build", object.class, new Block((Body)() ->
+          {
-...
              Assert.isType(oBuilderType, ObjectOps.getLegacyClass(CookieJarBuilder.class));
              object<? extends CookieJarBuilder> oCJB = (object<? extends CookieJarBuilder>)
                       ObjectOps.newInstance(oBuilderType.ref().getType());
              oCJB.assign(ObjectOps.newInstance(oBuilderType.ref().getType()));
              if (oCJB._isValid() && oCJB.ref() instanceof ISupportInitialize)
                 ((ISupportInitialize) oCJB.ref()).initialize();
-...
+       {
           object<? extends com.goldencode.p2j.oo.lang.LegacyClass> poDecorationType = TypeFactory.initInput(_poDecorationType);
           object<? extends com.goldencode.p2j.oo.net.http.ICookieJar> poDecoratedClient = TypeFactory.initInput(_poDecoratedClient);
           object<? extends com.goldencode.p2j.oo.net.http.ICookieJar> decoratedClient = TypeFactory.object(ICookieJar.class);
           return function(CookieJarBuilder.class, "DecorateCookieJar", object.class, new Block((Body)() ->
+          {
-...
              Assert.isType(oType, ObjectOps.getLegacyClass(CookieJarDecorator.class));
              object<? extends _BaseObject_> decoratedClient = ObjectOps.newInstance(oType.ref().getType(), "I", poDecoratedClient);
              decoratedClient.assign(ObjectOps.newInstance(oType.ref().getType(), "I", poDecoratedClient));
              if (decoratedClient._isValid() && decoratedClient.ref() instanceof ISupportInitialize)
                 ((ISupportInitialize) decoratedClient.ref()).initialize();

     **     CA  20210221 Fixed parameters at the LegacySignature annotation.
     ** 007 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 008 ME  20210524 Added support for retries, destroy library and fix variable scope on execute.
     */
     /*
-...
     import static com.goldencode.p2j.util.BlockManager.returnNormal;
     import com.goldencode.p2j.oo.core.*;
     import com.goldencode.p2j.oo.logging.*;
     import com.goldencode.p2j.oo.net.http.filter.status.AuthorizationStatusFilter;
     import com.goldencode.p2j.oo.net.http.filter.status.RedirectStatusFilter;
     import com.goldencode.p2j.oo.net.http.filter.writer.*;
     import com.goldencode.p2j.ui.LogicalTerminal;
     import com.goldencode.p2j.util.*;
-...
         * Destroy.
         */
        @LegacySignature(type = Type.METHOD, name = "Destroy")
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        @Override
        public void destroy()
+       {
           internalProcedure(HttpClient.class, this, "Destroy", new Block());
           internalProcedure(HttpClient.class, this, "Destroy", new Block((Body) () ->
+          {
              if (ObjectOps.typeOf(library, ISupportInitialize.class).booleanValue())
                 ObjectOps.cast(library, ISupportInitialize.class).ref().destroy();
           }));
+       }
        /**
-...
+        *
         * @return HTTP Response.
         */
        @LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "Execute", qualified = IHTTPRESPONSE, parameters =
+       {
           @LegacyParameter(name = "poRequest", type = "OBJECT", qualified = IHTTPREQUEST, mode = "INPUT")
        })
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        @LegacySignature(returns = "OBJECT", type = Type.METHOD, name = "Execute", qualified = IHTTPRESPONSE, parameters = {
                 @LegacyParameter(name = "poRequest", type = "OBJECT", qualified = IHTTPREQUEST, mode = "INPUT") })
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL)
        @Override
        public object<? extends IhttpResponse> execute(object<? extends IhttpRequest> _poRequest)
+       {
           object<? extends IhttpRequest> poRequest = TypeFactory.initInput(_poRequest);
           return function(this, "execute", object.class, new Block((Body) () ->
+          {
              object<? extends IhttpResponse> poResponse = ResponseBuilder.build().ref().getResponse();
           object<? extends IhttpResponse> poResponse = TypeFactory.object(IhttpResponse.class);
           return function(this, "execute", object.class, new Block((Init) () -> {
              ObjectOps.register(poResponse);
           }, (Body) () -> {
              poResponse.assign(ResponseBuilder.build().ref().getResponse());
              execute(poRequest, poResponse);
              returnNormal(poResponse);
           }));
-...
+       {
           object<? extends IhttpRequest> poRequest = TypeFactory.initInput(_poRequest);
           object<? extends IhttpResponse> poResponse = TypeFactory.initInput(_poResponse);
           internalProcedure(this, "__net_http_FwdHttpClientLibrary_constructor__", new Block((Body) () ->
           internalProcedure(this, "execute", new Block((Body) () ->
+          {
              int retry = Math.max(options.ref().getNumRetries().intValue(), 0);
              double retryPause = retry > 0 ? Math.max(options.ref().getPauseBetweenRetry().doubleValue(), 0) : 0;
              Assert.notNull(poRequest, new character("Http request"));
              Assert.notNull(poResponse, new character("Http response"));
              int retries = Math.max(options.ref().getNumRetries().intValue(), 0);
              int retry = 0;
              double retryPause = retries > 0 ? Math.max(options.ref().getPauseBetweenRetry().doubleValue(), 0) : 0;
              raw reqHash = TypeFactory.raw();
              if (retries > 0)
                 getLogger().ref().debug(TextOps.substitute("Initial request for &1 &2; max retries=&3",
                          poRequest.ref().getMethod(),
                          poRequest.ref().getUri().ref().toLegacyString(),
                          retries));
              do
+             {
                 if (retry > 0)
                    getLogger().ref().debug(TextOps.substitute("Retry attempt &1 of &2 for &3 &4",
                             retry,
                             retries,
                             poRequest.ref().getMethod(),
                             poRequest.ref().getUri().ref().toLegacyString()));
                 addUserAgent(poRequest);
                 _addAuthentication(poRequest);
                 reqHash.assign(poRequest.ref().getContentMd5());
                 library.ref().execute(poRequest, poResponse);
                 if (retry > 0 && retryPause > 0)
                    LogicalTerminal.pause(retryPause, (String) null);
                 if (processStatusAction(poRequest, poResponse).booleanValue())
                    break;
                 if (retries == 0 || (retries > 0 && CompareOps._isEqual(reqHash, poRequest.ref().getContentMd5())))
+                {
                    retry++;
                    if (retryPause > 0)
                       LogicalTerminal.pause(retryPause, (String) null);
+                }
+             }
              while(retry >= 0 && !processStatusAction(poRequest, poResponse).booleanValue());
              while(retry <= retries);
           }));
+       }
        private void _addAuthentication(object<? extends IhttpRequest> _poRequest)
+       {
           object<? extends IAuthenticatedRequest> authRequest = TypeFactory
                    .object(IAuthenticatedRequest.class);
           if (ObjectOps.typeOf(_poRequest, IAdaptable.class).booleanValue())
+          {
              authRequest.assign(ObjectOps.cast(_poRequest, IAdaptable.class).ref()
                       .getAdapter(ObjectOps.getLegacyClass(IAuthenticatedRequest.class)));
+          }
           if (!authRequest._isValid() && ObjectOps.typeOf(_poRequest, IAuthenticatedRequest.class).booleanValue())
+          {
              authRequest.assign(ObjectOps.cast(_poRequest, IAuthenticatedRequest.class));
+          }
           if (authRequest._isValid())
              authRequest.ref().addAuthentication();
+       }
        /**
         * Process HttpResponse status code.
+        *
-...
              if (statusCodeWriter._isValid())
+             {
                 // really no point to retry if authorization is required but not an authenticated request
                 if (ObjectOps.typeOf(statusCodeWriter, AuthorizationStatusFilter.class).booleanValue() &&
                          ObjectOps.typeOf(poRequest, AuthenticatedRequest.class).booleanValue())
                    returnNormal(true);
                 // maybe there is no point to retry if authorization is required but
                 // not an authenticated request, still seems not to be the case in 4GL
                 // if (ObjectOps.typeOf(statusCodeWriter, AuthorizationStatusFilter.class).booleanValue() &&
                 //         ObjectOps.typeOf(poRequest, AuthenticatedRequest.class).booleanValue())
                 //   returnNormal(true);
                 // copy session management info from initial response, if any
                 _copyCookies(poResponse.ref(), poRequest.ref());

     **                  - TypeFactory.initInput will take care of this.
     ** 005 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 006 ME  20210520 Fixed local variable scope for return parameter.
     */
     /*
-...
        public object<? extends com.goldencode.p2j.oo.net.http.IhttpResponse> execute(
                 final object<? extends com.goldencode.p2j.oo.net.http.IhttpRequest> _poRequest)
+       {
           object<? extends IhttpResponse> poResponse = TypeFactory.object(IhttpResponse.class);
           return function(HttpClientDecorator.class, this, "Execute", object.class, new Block((Body) () ->
+          {
              object<? extends IhttpResponse> poResponse = ResponseBuilder.build().ref().getResponse();
              poResponse.assign(ResponseBuilder.build().ref().getResponse());
              execute(_poRequest, poResponse);

src/com/goldencode/p2j/oo/net/http/HttpHeader.java 2021-05-24 06:41:34 +0000
13	13	** ME 20210111 Fix toString (null header).
14	14	** 005 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
15	15	** signature.
	16	** 006 ME 20210519 Fix NULL header lazy loading.
16	17	*/
17	18
18	19	/*
...	...
317	318	{
318	319	return function(null, "NullHeader", object.class, new Block((Body) () ->
319	320	{
320		object<? extends NullHeader> nullHeader = NULL.get();
321
322		if (!nullHeader._isValid())
	321	if (!NULL.get()._isValid())
323	322	{
324		nullHeader = ObjectOps.newInstance(NullHeader.class);
325		NULL.set(nullHeader);
	323	NULL.get().assign(ObjectOps.newInstance(NullHeader.class));
326	324	}
327	325
328		returnNormal(nullHeader);
	326	returnNormal(NULL.get());
329	327	}));
330	328	}
331	329

src/com/goldencode/p2j/oo/net/http/HttpHeaderBuilder.java 2021-05-24 06:41:34 +0000
11	11	** 004 CA 20210216 Fixed getRegistry() - the static var must be assigned, and not re-initialized.
12	12	** 005 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
13	13	** signature.
	14	** 006 ME 20210519 Fix registry lazy loading.
14	15	*/
15	16
16	17	/*
...	...
203	204	{
204	205	return function(HttpHeaderBuilder.class, "Registry", object.class, new Block((Body) () ->
205	206	{
206		object<? extends BuilderRegistry> registry = REGISTRY.get();
207
208		if (!registry._isValid())
	207	if (!REGISTRY.get()._isValid())
209	208	{
210		registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
	209	REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
211	210	ObjectOps.getLegacyClass(HttpHeaderBuilder.class)));
212		initializeRegistry(registry);
	211	initializeRegistry(REGISTRY.get());
213	212	}
214		returnNormal(registry);
	213	returnNormal(REGISTRY.get());
215	214	}));
216	215	}
217	216
...	...
253	252	public static object<? extends HttpHeaderBuilder> build(final character _hName)
254	253	{
255	254	character hName = TypeFactory.initInput(_hName);
256
	255	object<? extends HttpHeaderBuilder> builder = TypeFactory.object(HttpHeaderBuilder.class);
	256
257	257	return function(HttpHeaderBuilder.class, "Build", object.class, new Block((Body) () ->
258	258	{
259	259	Assert.notNullOrEmpty(hName, new character("Header name"));
...	...
263	263	builderType.assign(getRegistry().ref().get(new character("*")));
264	264	}
265	265	Assert.isType(builderType, ObjectOps.getLegacyClass(HttpHeaderBuilder.class));
266		object<? extends HttpHeaderBuilder> builder = (object<? extends HttpHeaderBuilder>) ObjectOps
267		.newInstance(builderType.ref().getType(), "I", hName);
	266	builder.assign(ObjectOps.newInstance(builderType.ref().getType(), "I", hName));
268	267	if (ObjectOps.typeOf(builder, ISupportInitialize.class).booleanValue())
269	268	{
270	269	ObjectOps.cast(builder, ISupportInitialize.class).ref().initialize();

     ** 007 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     **     ME  20210310 Add block 'referent' for static methods.
     ** 008 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
+       {
           object<? extends LegacyClass> poDecorationType = TypeFactory.initInput(_poDecorationType);
           object<? extends IhttpRequest> poDecoratedRequest = TypeFactory.initInput(_poDecoratedRequest);
           object<? extends IhttpRequest> oRequest = TypeFactory.object(IhttpRequest.class);
           return function(RequestBuilder.class, "DecorateRequest", object.class,
                 new Block((Body) () -> {
-...
                 Assert.isType(oDecorator, ObjectOps.getLegacyClass(HttpRequestDecorator.class));
                 object<? extends _BaseObject_> oRequest = ObjectOps.newInstance(oDecorator.ref().getType(), "I", poDecoratedRequest);
                 oRequest.assign(ObjectOps.newInstance(oDecorator.ref().getType(), "I", poDecoratedRequest));
                 if (oRequest._isValid() && oRequest.ref() instanceof ISupportInitialize)
                    ((ISupportInitialize) oRequest.ref()).initialize();
-...
+       {
           return function(RequestBuilder.class, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = REGISTRY.get();
              if (!registry._isValid()) {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class));
                 initializeRegistry(registry);
              if (!REGISTRY.get()._isValid()) {
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
                 initializeRegistry(REGISTRY.get());
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }
-...
+       {
           character pcMethod = TypeFactory.initInput(_pcMethod);
           object<? extends Uri> poURI = TypeFactory.initInput(_poURI);
           object<? extends RequestBuilder> builder = TypeFactory.object(RequestBuilder.class);
           return function(RequestBuilder.class, "Build", object.class, new Block((Body) () -> {
              object<? extends LegacyClass> builderCls = ObjectOps
                       .getLegacyClass(RequestBuilder.class);
-...
              Assert.isType(builderType, builderCls);
              object<? extends _BaseObject_> builder = ObjectOps
                       .newInstance(builderType.ref().getType(), "II", pcMethod, poURI);
              builder.assign(ObjectOps.newInstance(builderType.ref().getType(), "II", pcMethod, poURI));
              if (builder._isValid() && builder.ref() instanceof ISupportInitialize)
                 ((ISupportInitialize) builder.ref()).initialize();

     ** 004 CA   20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                   signature.
     **     ME   20210310 Add block 'referent' for static methods.
     ** 005 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
+       {
           return function(ResponseBuilder.class, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = REGISTRY.get();
              if (!registry._isValid()) {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class));
              if (!REGISTRY.get()._isValid()) {
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
                 registry.ref()._put(ObjectOps.getLegacyName(IhttpResponse.class),
                 REGISTRY.get().ref()._put(ObjectOps.getLegacyName(IhttpResponse.class),
                          ObjectOps.getLegacyClass(HttpResponse.class));
                 registry.ref()._put(ObjectOps.getLegacyName(ResponseBuilder.class),
                 REGISTRY.get().ref()._put(ObjectOps.getLegacyName(ResponseBuilder.class),
                       ObjectOps.getLegacyClass(DefaultResponseBuilder.class));
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }

                 final character _pcRealm)
+       {
           character pcRealm = TypeFactory.initInput(_pcRealm);
           object<? extends AuthenticationRequestEventArgs> oAuthReqArgs = TypeFactory.object(AuthenticationRequestEventArgs.class);
           return function(AuthenticationRequestFilter.class, this, "GetCredentials", object.class,
                    new Block((Body) () ->
+                   {
-...
                       if (authenticatedRequest.ref().getCredentials()._isValid())
                          returnNormal(authenticatedRequest.ref().getCredentials());
                       object<? extends AuthenticationRequestEventArgs> oAuthReqArgs = ObjectOps.newInstance(AuthenticationRequestEventArgs.class,
                                "II", message, pcRealm);
                       oAuthReqArgs.assign(ObjectOps.newInstance(AuthenticationRequestEventArgs.class,
                                "II", message, pcRealm));
                       onHttpCredentialRequest(oAuthReqArgs);

     ** 005 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     **     ME  20210310 Add block 'referent' for static methods.
     ** 006 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
        public static object<? extends BuilderRegistry> getRegistry()
+       {
           return function(AuthenticationRequestWriterBuilder.class, "Registry", object.class, new Block((Body) () -> {
              object<? extends BuilderRegistry> registry = REGISTRY.get();
              if (!registry._isValid())
              if (!REGISTRY.get()._isValid())
+             {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class));
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
                 registry.ref()._put("Basic",
                 REGISTRY.get().ref()._put("Basic",
                          ObjectOps.getLegacyClass(BasicAuthenticationFilter.class));
                 registry.ref()._put("Digest",
                 REGISTRY.get().ref()._put("Digest",
                          ObjectOps.getLegacyClass(DigestAuthenticationFilter.class));
                 registry.ref()._put("None", ObjectOps.getLegacyClass(NoAuthenticationFilter.class));
                 REGISTRY.get().ref()._put("None", ObjectOps.getLegacyClass(NoAuthenticationFilter.class));
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }
+    }

     ** 004 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     **     ME  20210310 Add block 'referent' for static methods.
     ** 005 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
     package com.goldencode.p2j.oo.net.http.filter.writer;
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.util.BlockManager.Action;
     import com.goldencode.p2j.util.BlockManager.Condition;
     import com.goldencode.p2j.oo.lang.*;
     import com.goldencode.p2j.oo.net.http.*;
     import com.goldencode.p2j.oo.net.http.filter.payload.*;
-...
+       {
           return function(BodyWriterRegistry.class, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = REGISTRY.get();
              if (!registry._isValid())
              if (!REGISTRY.get()._isValid())
+             {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                          ObjectOps.getLegacyClass(MessageWriter.class)));
                 initializeRegistry(registry);
                 initializeRegistry(REGISTRY.get());
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }
-...
              _poRegistry.ref()._put("text/html", ObjectOps.getLegacyClass(HtmlBodyWriter.class));
           }));
+       }
        @LegacySignature(type = Type.CONSTRUCTOR)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL)
        public static void __net_http_filter_writer_BodyWriterRegistry_constructor__static__()
+       {
           externalProcedure(BodyWriterRegistry.class, new Block((Body) () -> {
              onBlockLevel(Condition.ERROR, Action.THROW);
           }));
+       }
+    }

     **     ME  20210204 Cleanup/fix errors on getWritter method.
     ** 005 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 006 ME  20210519 Fix variable scope for method return value.
     */
     /*
-...
              );
           }));
+       }
        /**
         * Get message writer
+        *
-...
        @Override
        public object<? extends MessageWriter> getWriter()
+       {
           return function(this, "Writer", object.class, new Block((Body)() -> {
           object<? extends MessageWriter> writer = TypeFactory.object(MessageWriter.class);
           return function(this, "Writer", object.class, new Block((Init) () ->
+          {
              ObjectOps.register(writer);
           }, (Body)() -> {
              object<? extends MessageWriter> writer = TypeFactory.object(MessageWriter.class);
              object<? extends LegacyClass> writerType = TypeFactory.object(LegacyClass.class);
              object<? extends BaseObject> entity = TypeFactory.object(BaseObject.class);

     **     ME  20210208 Fix static registry property initialization.
     ** 004 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 005 ME  20210519 Fix registry lazy loading, added static ctor.
     */
     /*
-...
     package com.goldencode.p2j.oo.net.http.filter.writer;
     import static com.goldencode.p2j.util.BlockManager.externalProcedure;
     import static com.goldencode.p2j.util.BlockManager.function;
     import static com.goldencode.p2j.report.ReportConstants.*;
     import static com.goldencode.p2j.util.BlockManager.internalProcedure;
     import static com.goldencode.p2j.util.BlockManager.onBlockLevel;
     import static com.goldencode.p2j.util.BlockManager.returnNormal;
     import com.goldencode.p2j.oo.lang.*;
-...
     import com.goldencode.p2j.oo.net.http.filter.payload.*;
     import com.goldencode.p2j.security.*;
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.util.BlockManager.Action;
     import com.goldencode.p2j.util.BlockManager.Condition;
     import com.goldencode.p2j.util.InternalEntry.*;
     /**
-...
+          }
        };
        @LegacySignature(type = Type.CONSTRUCTOR)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL)
        public static void __net_http_filter_writer_EntityWriterRegistry_constructor__static__()
+       {
           externalProcedure(EntityWriterRegistry.class, new Block((Body) () -> {
              onBlockLevel(Condition.ERROR, Action.THROW);
           }));
+       }
        /**
         * Get registry.
+        *
-...
+       {
           return function(EntityWriterRegistry.class, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = EntityWriterRegistry.REGISTRY.get();
              if (!registry._isValid())
              if (!REGISTRY.get()._isValid())
+             {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                          ObjectOps.getLegacyClass(MessageWriter.class)));
                 initializeRegistry(registry);
                 initializeRegistry(REGISTRY.get());
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }

     **                  signature.
     **     ME  20210310 Add block 'referent' for static methods, use initInput for object params.
     **     ME  20210330 Fix registry class type.
     ** 005 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        public static object<? extends BuilderRegistry> getRegistry()
+       {
           object<? extends BuilderRegistry> registry = TypeFactory.object(BuilderRegistry.class);
           return function(BodyWriterRegistry.class, "Registry", object.class, new Block((Body) () -> {
             registry.assign(REGISTRY.get());
             if (!registry._isValid())
             if (!REGISTRY.get()._isValid())
+            {
                registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                         ObjectOps.getLegacyClass(MessageWriterBuilder.class)));
                initializeRegistry(registry);
                initializeRegistry(REGISTRY.get());
+            }
             returnNormal(registry);
             returnNormal(REGISTRY.get());
           }));
+       }

src/com/goldencode/p2j/oo/net/http/filter/writer/RequestWriterBuilder.java 2021-05-24 06:41:34 +0000
14	14	** signature.
15	15	** ME 20210301 Added class 'referent' for static methods, always use registry getter.
16	16	** 20210310 Added missing implementation (OE12.2).
	17	** 004 ME 20210519 Fix registry lazy loading.
17	18	*/
18	19
19	20	/*
...	...
183	184	@LegacyResourceSupport(supportLvl = CVT_LVL_FULL\|RT_LVL_FULL)
184	185	public static object<? extends BuilderRegistry> getRegistry()
185	186	{
186		object<? extends BuilderRegistry> registry = TypeFactory.object(BuilderRegistry.class);
187
188	187	return function(RequestWriterBuilder.class, "Registry", object.class, new Block((Body) () ->
189	188	{
190		registry.assign(REGISTRY.get());
191
192		if (!registry._isValid())
	189	if (!REGISTRY.get()._isValid())
193	190	{
194		registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
	191	REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
195	192	ObjectOps.getLegacyClass(MessageWriter.class)));
196		initializeRegistry(registry);
	193	initializeRegistry(REGISTRY.get());
197	194	}
198	195
199		returnNormal(registry);
	196	returnNormal(REGISTRY.get());
200	197	}));
201	198	}
202	199
...	...
337	334	@LegacyResourceSupport(supportLvl = CVT_LVL_FULL\|RT_LVL_FULL)
338	335	protected object<? extends MessageWriter> newRequestWriter()
339	336	{
	337	object<? extends MessageWriter> wObj = TypeFactory.object(MessageWriter.class);
	338
340	339	return function(RequestWriterBuilder.class, this, "NewRequestWriter", object.class, new Block((Body) () ->
341	340	{
342	341	object<? extends LegacyClass> wCls = getWriter(request, getRegistry());
343		object<? extends MessageWriter> wObj = TypeFactory.object(MessageWriter.class);
344	342
345	343	if (wCls._isValid())
346	344	{
...	...
386	384	{
387	385	object<? extends IhttpRequest> pRequest = TypeFactory.initInput(_pRequest);
388	386	object<? extends BuilderRegistry> pRegistry = TypeFactory.initInput(_pRegistry);
	387	object<? extends LegacyClass> oCls = TypeFactory.object(LegacyClass.class);
389	388
390	389	return function(RequestWriterBuilder.class, this, "GetWriter", object.class, new Block((Body) () ->
391	390	{
392	391	Assert.notNull(pRegistry, new character("Request writer registry"));
393	392
394		object<? extends LegacyClass> oCls = TypeFactory.object(LegacyClass.class);
395
396	393	if (pRequest._isValid())
397	394	{
398	395	oCls.assign(pRegistry.ref().get(TextOps.trim(TextOps.substitute("&1+&2", pRequest.ref().getVersion(), pRequest.ref().getMethod()))));

src/com/goldencode/p2j/oo/net/http/filter/writer/SetHeaderMessageWriterBuilder.java 2021-05-24 06:41:34 +0000
11	11	** 20210208 Fix static registry property initialization, add static ctor.
12	12	** 004 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
13	13	** signature.
	14	** 005 ME 20210519 Fix registry lazy loading.
14	15	*/
15	16
16	17	/*
...	...
131	132	{
132	133	return function(SetHeaderMessageWriterBuilder.class, "Registry", object.class, new Block((Body) () ->
133	134	{
134		object<? extends BuilderRegistry> registry = REGISTRY.get();
135
136		if (!registry._isValid())
	135	if (!REGISTRY.get()._isValid())
137	136	{
138		registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
	137	REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
139	138	ObjectOps.getLegacyClass(IHttpMessageWriter.class)));
140		initializeRegistry(registry);
	139	initializeRegistry(REGISTRY.get());
141	140	}
142	141
143		returnNormal(registry);
	142	returnNormal(REGISTRY.get());
144	143	}));
145	144	}
146	145

     ** 003 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     **     ME  20210301 Added class 'referent' for static methods, always use registry getter.
     ** 004 ME  20210519 Fix registry lazy loading.
     */
     /*
-...
     package com.goldencode.p2j.oo.net.http.filter.writer;
     import static com.goldencode.p2j.util.BlockManager.externalProcedure;
     import static com.goldencode.p2j.util.BlockManager.function;
     import static com.goldencode.p2j.report.ReportConstants.*;
     import static com.goldencode.p2j.util.BlockManager.internalProcedure;
     import static com.goldencode.p2j.report.ReportConstants.*;
     import static com.goldencode.p2j.util.BlockManager.onBlockLevel;
     import static com.goldencode.p2j.util.BlockManager.returnNormal;
     import static com.goldencode.p2j.report.ReportConstants.*;
     import com.goldencode.p2j.oo.core.*;
     import com.goldencode.p2j.oo.lang.*;
-...
     import com.goldencode.p2j.oo.net.http.filter.status.*;
     import com.goldencode.p2j.security.*;
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.util.BlockManager.Action;
     import com.goldencode.p2j.util.BlockManager.Condition;
     import com.goldencode.p2j.util.InternalEntry.*;
     /**
-...
              return TypeFactory.object(BuilderRegistry.class);
+          }
        };
        @LegacySignature(type = Type.CONSTRUCTOR)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL | RT_LVL_FULL)
        public static void __net_http_filter_writer_StatusCodeWriterBuilder_constructor__static__()
+       {
           externalProcedure(StatusCodeWriterBuilder.class, new Block((Body) () -> {
              onBlockLevel(Condition.ERROR, Action.THROW);
           }));
+       }
        /**
         * Get registry.
-...
+       {
           return function(StatusCodeWriterBuilder.class, "Registry", object.class, new Block((Body) () ->
+          {
              object<? extends BuilderRegistry> registry = REGISTRY.get();
              if (!registry._isValid())
              if (!REGISTRY.get()._isValid())
+             {
                 registry.assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                 REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class, "I",
                          ObjectOps.getLegacyClass(IHttpMessageWriter.class)));
                 initializeRegistry(registry);
                 initializeRegistry(REGISTRY.get());
+             }
              returnNormal(registry);
              returnNormal(REGISTRY.get());
           }));
+       }
-...
              object<? extends IhttpRequest> poRequest,
              object<? extends IhttpResponse> poResponse)
+       {
           object<? extends IHttpMessageWriter> writer = TypeFactory.object(IHttpMessageWriter.class);
           return function(StatusCodeWriterBuilder.class, "Build", object.class, new Block((Body)() -> {
              object<? extends IHttpMessageWriter> writer =
                    TypeFactory.object(IHttpMessageWriter.class);
              object<? extends LegacyClass> writerType = TypeFactory.object(LegacyClass.class);
              Assert.notNull(poResponse, new character("Response"));

src/com/goldencode/p2j/oo/net/http/lib/ClientLibraryBuilder.java 2021-05-24 06:41:34 +0000
16	16	** 007 CA 20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
17	17	** signature.
18	18	** ME 20210301 Added class 'referent' for static methods.
	19	** 008 ME 20210519 Fix registry lazy loading.
19	20	*/
20	21
21	22	/*
...	...
191	192	{
192	193	return function(ClientLibraryBuilder.class, "Registry", object.class, new Block((Body) () ->
193	194	{
194		object<? extends BuilderRegistry> registry = REGISTRY.get();
195
196		if (!registry._isValid())
	195	if (!REGISTRY.get()._isValid())
197	196	{
198		registry.assign(ObjectOps.newInstance(BuilderRegistry.class));
199		initializeRegistry(registry);
	197	REGISTRY.get().assign(ObjectOps.newInstance(BuilderRegistry.class));
	198	initializeRegistry(REGISTRY.get());
200	199	}
201		returnNormal(registry);
	200	returnNormal(REGISTRY.get());
202	201	}));
203	202	}
204	203

     **                  - TypeFactory.initInput will take care of this.
     ** 007 CA  20210221 Fixed 'qualified', 'extent' and 'returns' annotations at the legacy
     **                  signature.
     ** 008 ME  20210426 Removed default ctor, add destructor to clean-up client socket and connect params.
     ** 009 ME  20210524 Added request timeout, improve error handling (4GL style).
     */
     /*
-...
     import static com.goldencode.p2j.util.BlockManager.internalProcedure;
     import static com.goldencode.p2j.util.BlockManager.onBlockLevel;
     import static com.goldencode.p2j.util.BlockManager.returnNormal;
     import static com.goldencode.p2j.util.BlockManager.undoThrow;
     import java.io.*;
     import java.net.*;
-...
     import com.goldencode.p2j.util.*;
     import com.goldencode.p2j.util.BlockManager.Action;
     import com.goldencode.p2j.util.BlockManager.Condition;
     import com.goldencode.p2j.util.ErrorManager;
     import com.goldencode.p2j.util.InternalEntry.*;
     import com.goldencode.p2j.xml.*;
-...
              object<? extends IhttpResponse> _poResponse)
+       {
           object<? extends IhttpRequest> poRequest = TypeFactory.initInput(_poRequest);
           internalProcedure(this, "__net_http_lib_ablsockets_ABLSocketLibrary_constructor__", new Block((Body) () ->
           object<? extends IhttpResponse> poResponse = TypeFactory.initInput(_poResponse);
           internalProcedure(this, "execute", new Block((Body) () ->
+          {
              _execute(poRequest, _poResponse);
              Assert.notNull(poRequest, new character("HTTP request"));
              Assert.notNull(poResponse, new character("HTTP response"));
              integer port = poRequest.ref().getUri().ref().getPort();
              // too high port number checked by client socket probably, comes before host check
              if (!port.isUnknown() && port.intValue() > 65535)
+             {
                 undoThrow(AppError.newInstance(String.format("Port is too large: %d", port.intValue()), 0));
+             }
              character host = poRequest.ref().getUri().ref().getHost();
              // spaces in host name is breaking the connection params (-H xxxx yyyy)
              if (TextOps.numEntries(host, " ").intValue() > 1)
+             {
                 ErrorManager.recordOrThrowError(new int[] { 301, 5509, 5510 },
                          new String[] {
                                   String.format("** Could not recognize argument: %s",
                                            TextOps.entry(2, host, " ").toStringMessage()),
                                   "Unable to process parameters", "Invalid parameter string" },
                          false);
+             }
              // negative port is breaking the connection params (-S -xxxx)
              if (port.intValue() < 0)
+             {
                 ErrorManager.recordOrThrowError(new int[] { 1403, 5509, 5510 },
                          new String[] { "You have not supplied a parameter for argument -S",
                                   "Unable to process parameters", "Invalid parameter string" },
                          false);
+             }
              try
+             {
                 _execute(poRequest, poResponse);
+             }
              catch (UnknownHostException e)
+             {
                 undoThrow(SysError.newInstance(String.format("Unknown hostname %s",
                          poRequest.ref().getUri().ref().getHost()), 5482, false, true));
+             }
              catch (HttpHostConnectException e)
+             {
                 undoThrow(SysError.newInstance(
                          String.format("Connection failure for host %s port %d transport TCP",
                                   e.getHost().getHostName(), e.getHost().getPort()),
 , false, true));
+             }
              catch (IOException e)
+             {
                 // request terminated
                 readTerminatedHandler(null, null);
+             }
              catch (Exception e)
+             {
                 // TODO: there might be other cases
                 undoThrow(AppError.newInstance(String.format("Unknown exception: %s", e.getMessage()), 0));
+             }
           }));
+       }
        /**
         * Constructor
         * Destructor
         */
        @LegacySignature(type = Type.CONSTRUCTOR)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL_RESTR)
        public void __net_http_lib_sockets_LegacySocketLibrary_constructor__()
        @LegacySignature(type = Type.DESTRUCTOR)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        public void __net_http_lib_sockets_LegacySocketLibrary_destructor__()
+       {
           internalProcedure(this, "__net_http_lib_ablsockets_ABLSocketLibrary_constructor__", new Block((Body) () ->
           internalProcedure(this, "__net_http_lib_ablsockets_ABLSocketLibrary_destructor__", new Block((Body) () ->
+          {
              __lang_BaseObject_constructor__();
              moSocketLib.setUnknown();
              moSocketConnectionParam.setUnknown();
           }));
+       }
-...
           @LegacyParameter(name = "poSender", type = "OBJECT", qualified = "openedge.net.serverconnection.clientsocket", mode = "INPUT"),
           @LegacyParameter(name = "poEventArgs", type = "OBJECT", qualified = "openedge.net.serverconnection.socketreadeventargs", mode = "INPUT")
        })
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        public void readTerminatedHandler(final object<? extends com.goldencode.p2j.oo.net.serverconnection.ClientSocket> _poSender, final object<? extends com.goldencode.p2j.oo.net.serverconnection.SocketReadEventArgs> _poEventArgs)
+       {
           object<? extends com.goldencode.p2j.oo.net.serverconnection.ClientSocket> poSender = TypeFactory.initInput(_poSender);
-...
           internalProcedure(LegacySocketLibrary.class, this, "ReadTerminatedHandler", new Block((Body) () ->
+          {
              UnimplementedFeature.missing("ABLSocketLibrary:ReadTerminatedHandler METHOD");
              undoThrow(AppError.newInstance(TextOps.substitute("Read terminated for &1",
                       moSocketConnectionParam.ref().getUri().ref().toLegacyString()), new integer(105)));
           }));
+       }
-...
           @LegacyParameter(name = "poSender", type = "OBJECT", qualified = "openedge.net.serverconnection.clientsocket", mode = "INPUT"),
           @LegacyParameter(name = "poEventArgs", type = "OBJECT", qualified = "openedge.net.serverconnection.socketreadeventargs", mode = "INPUT")
        })
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_STUB)
        @LegacyResourceSupport(supportLvl = CVT_LVL_FULL|RT_LVL_FULL)
        public void readTimeoutHandler(final object<? extends com.goldencode.p2j.oo.net.serverconnection.ClientSocket> _poSender, final object<? extends com.goldencode.p2j.oo.net.serverconnection.SocketReadEventArgs> _poEventArgs)
+       {
           object<? extends com.goldencode.p2j.oo.net.serverconnection.ClientSocket> poSender = TypeFactory.initInput(_poSender);
-...
           internalProcedure(LegacySocketLibrary.class, this, "ReadTimeoutHandler", new Block((Body) () ->
+          {
              UnimplementedFeature.missing("ABLSocketLibrary:ReadTimeoutHandler METHOD");
              undoThrow(ObjectOps.newInstance(HttpRequestError.class, "III",
                       new character(StatusCodeEnum.requestTimeOut),
                       new character("read"),
                       moSocketConnectionParam.ref().getUri().ref().toLegacyString()));
           }));
+       }
-...
         *        request
         * @param rsp
         *        response
         * @throws Exception
         */
        private void _execute(object<? extends IhttpRequest> req, object<? extends IhttpResponse> rsp)
        private void _execute(object<? extends IhttpRequest> req, object<? extends IhttpResponse> rsp)
                 throws Exception
+       {
           Uri uri = req.ref().getUri().ref();
           String method = req.ref().getMethod().getValue();
-...
+          }
           java.net.URI _uri;
           try
           URIBuilder builder = new URIBuilder().setScheme(scheme).setHost(host).setPort(port)
                    .setPath(path);
           String encoding = I18nOps.getJavaCharset(req.ref().getCharacterEncoding());
           if (encoding != null && Charset.isSupported(encoding))
              builder.setCharset(Charset.forName(encoding));
           object<? extends IStringStringMap> qryMap = uri.getQueryMap_1();
           if (qryMap._isValid() && qryMap.ref().getSize().intValue() > 0)
+          {
              URIBuilder builder = new URIBuilder().
                       setScheme(scheme).
                       setHost(host).
                       setPort(port).
                       setPath(path);
              String encoding = I18nOps.getJavaCharset(req.ref().getCharacterEncoding());
              if (encoding != null && Charset.isSupported(encoding))
                 builder.setCharset(Charset.forName(encoding));
              object<? extends IStringStringMap> qryMap = uri.getQueryMap_1();
              if (qryMap._isValid() && qryMap.ref().getSize().intValue() > 0) {
                 object<? extends Iiterator> iterator = qryMap.ref().getKeySet().ref().iterator();
                 while (iterator.ref().hasNext().booleanValue())
+                {
                     object<? extends _BaseObject_> key = iterator.ref().next_();
                     object<? extends _BaseObject_> value = qryMap.ref().get(key);
                     builder.addParameter(key.ref().toLegacyString().getValue(),
                              value.ref().toLegacyString().getValue());
+                }
              object<? extends Iiterator> iterator = qryMap.ref().getKeySet().ref().iterator();
              while (iterator.ref().hasNext().booleanValue())
+             {
                 object<? extends _BaseObject_> key = iterator.ref().next_();
                 object<? extends _BaseObject_> value = qryMap.ref().get(key);
                 builder.addParameter(key.ref().toLegacyString().getValue(),
                          value.ref().toLegacyString().getValue());
+             }
              String fragment = uri.getFragment().getValue();
              if (!TextOps.isEmpty(fragment))
                 builder.setFragment(fragment);
              _uri = builder.build();
+          }
           catch (URISyntaxException e)
+          {
              LOG.log(Level.WARNING, "Invalid URI", e);
              rsp.ref().setStatusCode(new integer(500));
              rsp.ref().setStatusReason(new character("Invalid URI"));
              return;
+          }
           org.apache.http.client.methods.RequestBuilder requestBuilder =
                 org.apache.http.client.methods.RequestBuilder.create(method).setUri(_uri);
           String fragment = uri.getFragment().getValue();
           if (!TextOps.isEmpty(fragment))
              builder.setFragment(fragment);
           _uri = builder.build();

Project

General

Profile

FWD » Core Development » Base Language