Improve code layout.

Author: alexander-yevsyukov

client/src/main/proto/spine/annotations.proto

@@ -109,4 +109,4 @@ extend google.protobuf.FileOptions {
 extend google.protobuf.ServiceOptions {
     // Indicates that the service is a part of Service Provider Interface (SPI).
     bool SPI_service = 58012;
-}
+}

client/src/main/proto/spine/validate.proto

@@ -34,12 +34,11 @@ option java_multiple_files = true;
 option java_outer_classname = "ValidationProto";
 option java_package = "org.spine3.validate.internal";
 
+option (internal_all) = true;
+
 import "google/protobuf/descriptor.proto";
 import "spine/annotations.proto";
 
-
-option (internal_all) = true;
-
 // TODO:2016-02-18:alexander.litus: obtain globally unique field number(s) for opts from Google.
 
 // A type of an entity.

server/src/main/proto/spine/server/storage/aggregate_storage.proto

@@ -26,13 +26,12 @@ option java_outer_classname = "AggregateStorageProto";
 option java_multiple_files = true;
 option java_generate_equals_and_hash = true;
 
+option (SPI_all) = true;
+
 import public "spine/server/aggregate/snapshot.proto";
 import public "spine/base/event.proto";
 import "spine/annotations.proto";
 
-
-option (SPI_all) = true;
-
 // A record in the storage of events and snapshots of an aggregate type.
 //
 // Different types of aggregates are managed by different storages.

server/src/main/proto/spine/server/storage/command_storage.proto

@@ -26,6 +26,8 @@ option java_multiple_files = true;
 option java_outer_classname = "CommandStoreProto";
 option java_generate_equals_and_hash = true;
 
+option (SPI_all) = true;
+
 import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 
@@ -34,9 +36,6 @@ import "spine/base/error.proto";
 import "spine/base/failure.proto";
 import "spine/annotations.proto";
 
-
-option (SPI_all) = true;
-
 // This type defines the way commands are stored in command storage.
 // Some of the fields are defined as string representation of corresponding message types
 // so that these fields are available for querying.

server/src/main/proto/spine/server/storage/entity_storage.proto

@@ -26,12 +26,12 @@ option java_multiple_files = true;
 option java_outer_classname = "EntityStorageProto";
 option java_package = "org.spine3.server.storage";
 
-import public "google/protobuf/timestamp.proto";
-import public "google/protobuf/any.proto";
-import "spine/annotations.proto";
+option (SPI_all) = true;
 
+import "google/protobuf/timestamp.proto";
+import "google/protobuf/any.proto";
 
-option (SPI_all) = true;
+import "spine/annotations.proto";
 
 // Used to store entities in the entity storage.
 message EntityStorageRecord {

server/src/main/proto/spine/server/storage/event_storage.proto

@@ -26,14 +26,13 @@ option java_multiple_files = true;
 option java_outer_classname = "EventStorageProto";
 option java_generate_equals_and_hash = true;
 
+option (SPI_all) = true;
+
 import "google/protobuf/any.proto";
 import "google/protobuf/timestamp.proto";
 import "spine/base/event.proto";
 import "spine/annotations.proto";
 
-
-option (SPI_all) = true;
-
 // This type defines the way events are stored in event storage.
 // Some of the fields are defined as string representation of corresponding message types
 // so that these fields are available for querying.