Skip to content

Commit

Permalink
Replace transition imports
Browse files Browse the repository at this point in the history
The ocean.transition module was created to ease D2 conversion. It can
now be replaced with more appropriate imports.

In this commit, every `imports ocean.transition` is replaced with
`import ocean.meta.types.Qualifiers`.
  • Loading branch information
don-clugston-sociomantic authored and Daniel Zullo committed Jan 31, 2020
1 parent 3eaff86 commit 6129a0e
Show file tree
Hide file tree
Showing 115 changed files with 130 additions and 130 deletions.
2 changes: 1 addition & 1 deletion integrationtest/client_auth/main.d
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import integrationtest.neo.client.Client;

import swarm.neo.authentication.CredentialsFile;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.util.test.DirectorySandbox;
import ocean.core.Test;
import ocean.io.device.File;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/client_stats/main.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.client_stats.main;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Test;
import ocean.core.VersionCheck;
import ocean.io.device.File;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/Client.d
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

module integrationtest.neo.client.Client;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/// ditto
public class Client
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/NotifierTypes.d
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import ocean.text.convert.Formatter;

public struct RequestKeyDataInfo
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import swarm.neo.protocol.Message : RequestId;

/// ID of the request for which the notification is occurring.
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/DoublePut.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.DoublePut;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.SmartUnion;
import swarm.neo.client.NotifierTypes;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/Get.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.Get;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.SmartUnion;
import swarm.neo.client.NotifierTypes;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/GetAll.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.GetAll;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.SmartUnion;
import integrationtest.neo.client.NotifierTypes;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/Put.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.Put;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.SmartUnion;
import swarm.neo.client.NotifierTypes;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/RoundRobinPut.d
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

module integrationtest.neo.client.request.RoundRobinPut;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.SmartUnion;
import swarm.neo.client.NotifierTypes;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/internal/DoublePut.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.internal.DoublePut;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/internal/Get.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.internal.Get;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.common.Get;

/// Default (v0) Get implementation.
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/internal/GetAll.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.internal.GetAll;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/client/request/internal/Put.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.internal.Put;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.client.request.internal.RoundRobinPut;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/main.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.main;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.task.Scheduler;
import ocean.task.Task;

Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/Node.d
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

module integrationtest.neo.node.Node;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import swarm.node.model.NeoNode;
import swarm.node.connection.ConnectionHandler;
import swarm.Const : ICommandCodes, NodeItem;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/Storage.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.Storage;

import ocean.transition;
import ocean.meta.types.Qualifiers;

public class Storage
{
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/request/DoublePut.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.request.DoublePut;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.node.Storage;
import swarm.neo.node.RequestOnConn;
import swarm.neo.request.Command;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/request/Get.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.request.Get;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.node.Storage;
import swarm.neo.node.RequestOnConn;
import swarm.neo.request.Command;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/request/GetAll.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.request.GetAll;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.node.Storage;
import swarm.neo.node.RequestOnConn;
import swarm.neo.request.Command;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/request/Put.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.request.Put;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.node.Storage;
import swarm.neo.node.RequestOnConn;
import swarm.neo.request.Command;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/neo/node/request/RoundRobinPut.d
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

module integrationtest.neo.node.request.RoundRobinPut;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import integrationtest.neo.node.Storage;
import swarm.neo.node.IRequest;
import swarm.neo.node.RequestOnConn;
Expand Down
2 changes: 1 addition & 1 deletion integrationtest/record_stream/main.d
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import core.sys.posix.unistd;
import ocean.core.Test;
import ocean.io.Console;
import ocean.io.device.Device;
import ocean.transition;
import ocean.meta.types.Qualifiers;

import swarm.util.RecordStream;

Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/ClientExceptions.d
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ module swarm.client.ClientExceptions;
*******************************************************************************/

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Exception;


Expand Down
14 changes: 7 additions & 7 deletions src/swarm/client/RequestSetup.d
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public template RequestParamsSetup ( )
***************************************************************************/

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.meta.codegen.Identifier : identifier;
import swarm.client.request.params.IRequestParams;

Expand Down Expand Up @@ -69,7 +69,7 @@ public template RequestParamsSetup ( )

public template RequestBase ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import swarm.client.request.context.RequestContext;
import swarm.client.request.params.IRequestParams;
import swarm.client.request.notifier.IRequestNotification;
Expand Down Expand Up @@ -378,7 +378,7 @@ public template RequestBase ( )

public template ClientCommandBase ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import swarm.client.ClientCommandParams;
import swarm.client.request.notifier.IRequestNotification;
import swarm.client.request.params.IRequestParams;
Expand Down Expand Up @@ -485,7 +485,7 @@ public template ClientCommandBase ( )

public template Node ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Verify;
import swarm.Const;
import swarm.client.request.params.IRequestParams;
Expand Down Expand Up @@ -581,7 +581,7 @@ public template Node ( )

public template Channel ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Verify;
import ocean.core.TypeConvert : downcast;
import swarm.client.request.params.IRequestParams;
Expand Down Expand Up @@ -649,7 +649,7 @@ public template Channel ( )

public template Suspendable ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Verify;
import ocean.core.TypeConvert : downcast;
import ocean.meta.traits.Aggregates : hasMember;
Expand Down Expand Up @@ -751,7 +751,7 @@ public template Suspendable ( )

public template StreamInfo ( )
{
import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.core.Verify;
import ocean.core.TypeConvert : downcast;
import swarm.client.request.params.IRequestParams;
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/connection/RequestConnection.d
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ debug ( SwarmClient ) import ocean.io.Stdout;

import swarm.client.connection.FiberSocketConnection;

import ocean.transition;
import ocean.meta.types.Qualifiers;
import ocean.util.log.Logger;


Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/connection/RequestOverflow.d
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import swarm.Const;

import ocean.util.container.queue.FlexibleFileQueue;

import ocean.transition;
import ocean.meta.types.Qualifiers;

import Integer = ocean.text.convert.Integer_tango;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module swarm.client.connection.model.INodeConnectionPoolInfo;
*******************************************************************************/

import ocean.transition;
import ocean.meta.types.Qualifiers;


/******************************************************************************/
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/helper/NodesConfigReader.d
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module swarm.client.helper.NodesConfigReader;
*******************************************************************************/

import ocean.transition;
import ocean.meta.types.Qualifiers;

import swarm.Const : NodeItem;

Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/helper/SuspendableThrottler.d
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import swarm.client.request.context.RequestContext;
import swarm.client.request.model.ISuspendableRequest;

import ocean.core.array.Search : contains;
import ocean.transition;
import ocean.meta.types.Qualifiers;

import ocean.core.Verify;

Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/model/IClient.d
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ import ocean.io.select.EpollSelectDispatcher;

import ocean.util.config.ConfigFiller;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/plugins/NodeDeactivator.d
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import swarm.client.connection.NodeErrorTracker;

import swarm.Const : NodeItem;

import ocean.transition;
import ocean.meta.types.Qualifiers;

import ocean.core.Verify;

Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/plugins/RequestQueueDiskOverflow.d
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module swarm.client.plugins.RequestQueueDiskOverflow;

import swarm.client.connection.RequestOverflow;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/plugins/RequestScheduler.d
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import swarm.Const;

import swarm.client.request.notifier.IRequestNotification;

import ocean.transition;
import ocean.meta.types.Qualifiers;

/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/plugins/ScopeRequests.d
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

module swarm.client.plugins.ScopeRequests;

import ocean.transition;
import ocean.meta.types.Qualifiers;

import ocean.core.Verify;

Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/registry/FluidNodeRegistry.d
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import swarm.Const : NodeItem;

debug ( SwarmClient ) import ocean.io.Stdout;

import ocean.transition;
import ocean.meta.types.Qualifiers;


public class FluidNodeRegistry : NodeRegistry, IFluidNodeRegistry
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/registry/NodeRegistry.d
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import ocean.core.Verify;

import ocean.io.select.EpollSelectDispatcher;

import ocean.transition;
import ocean.meta.types.Qualifiers;


/*******************************************************************************
Expand Down
2 changes: 1 addition & 1 deletion src/swarm/client/registry/NodeSet.d
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import ocean.core.Verify;

import ocean.util.container.map.Map : StandardKeyHashingMap;

import ocean.transition;
import ocean.meta.types.Qualifiers;

import ocean.text.convert.Formatter;

Expand Down
Loading

0 comments on commit 6129a0e

Please sign in to comment.