From: Tony Tkacik Date: Fri, 11 Jul 2014 11:35:41 +0000 (+0000) Subject: Merge "Introducing simple merge strategy for config subsystem" X-Git-Tag: release/helium~491 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=05565ac29ed2e05fef72379c2d84ca43c01799b2;hp=1ed653e2399fccfd914215f6cbbbff4328b42e9e;p=controller.git Merge "Introducing simple merge strategy for config subsystem" --- diff --git a/features/extras/pom.xml b/features/extras/pom.xml new file mode 100644 index 0000000000..4563190b9f --- /dev/null +++ b/features/extras/pom.xml @@ -0,0 +1,81 @@ + + + 4.0.0 + + org.opendaylight.controller + commons.opendaylight + 1.4.2-SNAPSHOT + ../../opendaylight/commons/opendaylight + + extras-features + kar + ${project.artifactId} + Base Features POM + + features.xml + 3.9.2.Final + + + + + true + src/main/resources + + + + + org.apache.karaf.tooling + karaf-maven-plugin + ${karaf.version} + true + + + features-create-kar + + features-create-kar + + + ${project.build.directory}/classes/${features.file} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + filter + + resources + + generate-resources + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + attach-artifacts + + attach-artifact + + package + + + + ${project.build.directory}/classes/${features.file} + xml + features + + + + + + + + + diff --git a/features/extras/src/main/resources/features.xml b/features/extras/src/main/resources/features.xml new file mode 100644 index 0000000000..3be66d9a6e --- /dev/null +++ b/features/extras/src/main/resources/features.xml @@ -0,0 +1,34 @@ + + + + + mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version} + + + + mvn:org.scala-lang/scala-library/${scala.version}.${scala.micro.version} + mvn:org.scala-lang/scala-reflect/${scala.version}.${scala.micro.version} + + + + odl-extras-scala + mvn:com.typesafe/config/${typesafe.config.version} + mvn:com.typesafe.akka/akka-actor_${scala.version}/${akka.version} + mvn:com.typesafe.akka/akka-slf4j_${scala.version}/${akka.version} + mvn:com.typesafe.akka/akka-osgi_${scala.version}/${akka.version} + + + + odl-extras-akka-system + wrap:mvn:org.uncommons.maths/uncommons-maths/${uncommons.maths.version} + mvn:com.google.protobuf/protobuf-java/${protobuf.version} + wrap:mvn:io.netty/netty/${netty3.version} + mvn:com.typesafe.akka/akka-remote_${scala.version}/${akka.version} + mvn:com.typesafe.akka/akka-cluster_${scala.version}/${akka.version} + + + + wrap:mvn:org.iq80.leveldb/leveldb/${leveldb.version} + wrap:mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni.version} + + diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java index fe456f3f8e..4efcada2f8 100644 --- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java +++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java @@ -695,6 +695,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket, ICacheUpdateA dot1q.setVid(vlan); dot1q.setEtherType(EtherTypes.ARP.shortValue()); dot1q.setPayload(arp); + dot1q.setCfi((byte)0); + dot1q.setPcp((byte)0); ethernet.setEtherType(EtherTypes.VLANTAGGED.shortValue()); ethernet.setPayload(dot1q); } diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 3aeb2ccba7..28c23c8259 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -18,7 +18,7 @@ - 2.3.2 + 2.3.4 1.0.0 0.4.2-SNAPSHOT 0.0.1-SNAPSHOT @@ -62,6 +62,7 @@ 2.3.2 0.1.2-SNAPSHOT 0.5.2-SNAPSHOT + 1.4 0.2.5-SNAPSHOT 0.4.3-SNAPSHOT 0.4.3-SNAPSHOT @@ -111,10 +112,13 @@ 1.0.0-SNAPSHOT 3.0.0 3.0.1 + 0.7 + 1.8 1.0.0 1.0.9 0.4.2-SNAPSHOT 3.0.5 + 1.9.4 1.1-SNAPSHOT 0.2.5-SNAPSHOT 0.0.3-SNAPSHOT @@ -128,7 +132,10 @@ 1.4.2-SNAPSHOT 2013.08.27.4-SNAPSHOT 0.0.2-SNAPSHOT + 1.1.6 + 1.1.6 1.0-alpha-2 + 2.5.0 0.5.0-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT @@ -142,14 +149,22 @@ 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT - 2.11 + 2.10 + 4 0.4.2-SNAPSHOT + 1.2.4 dav:http://nexus.opendaylight.org/content/sites/site ${user.name}-private-view https://sonar.opendaylight.org/ jacoco java + org.openflow.openflowj,net.sf.jung2,org.opendaylight.controller.protobuff.messages + 1.0.0 + 1.2.1 + 3.1.4.RELEASE + 3.1.3.RELEASE + 3.1.3.RELEASE org.openflow.openflowj,net.sf.jung2 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT @@ -164,6 +179,8 @@ 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT 0.4.2-SNAPSHOT + 1.2.0 + 1.2.2 0.4.2-SNAPSHOT 0.0.2-SNAPSHOT 0.4.2-SNAPSHOT @@ -1227,6 +1244,11 @@ sal-restconf-broker ${mdsal.version} + + org.opendaylight.controller + sal-test-model + ${mdsal.version} + diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml index 6ddb1306c5..ae041f4585 100644 --- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml +++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/pom.xml @@ -20,6 +20,7 @@ org.opendaylight.controller config-api + ${config.version} diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang index 8c1dab1495..639610f3d5 100644 --- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang +++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__-impl.yang @@ -1,4 +1,3 @@ -// vi: set smarttab et sw=4 tabstop=4: module ${module-name}-${module-implementation-name} { yang-version 1; diff --git a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang index 2afc91e8e3..f77df5a22d 100644 --- a/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang +++ b/opendaylight/config/config-module-archetype/src/main/resources/archetype-resources/src/main/yang/__module-name__.yang @@ -1,4 +1,3 @@ -// vi: set smarttab et sw=4 tabstop=4: module ${module-name} { yang-version 1; diff --git a/opendaylight/config/config-util/pom.xml b/opendaylight/config/config-util/pom.xml index b6e2efcd45..7429f4d574 100644 --- a/opendaylight/config/config-util/pom.xml +++ b/opendaylight/config/config-util/pom.xml @@ -8,7 +8,7 @@ .. config-util - jar + bundle ${project.artifactId} @@ -42,6 +42,15 @@ 1 + + org.apache.felix + maven-bundle-plugin + + + org.opendaylight.controller.config.util + + + diff --git a/opendaylight/config/feature/src/main/resources/features.xml b/opendaylight/config/feature/src/main/resources/features.xml index 81972c3661..a84a74305f 100644 --- a/opendaylight/config/feature/src/main/resources/features.xml +++ b/opendaylight/config/feature/src/main/resources/features.xml @@ -1,27 +1,28 @@ - - odl-config-subsystem - + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> + + odl-config-subsystem + - - yangtools-concepts - yangtools-binding - yangtools-binding-generator - odl-mdsal-commons - mvn:org.opendaylight.controller/config-api/${project.version} - mvn:org.opendaylight.controller/config-manager/${project.version} - mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} - mvn:org.opendaylight.controller/config-persister-api/${project.version} - mvn:org.opendaylight.controller/config-persister-file-xml-adapter/${project.version} - mvn:org.opendaylight.controller/config-persister-directory-xml-adapter/${project.version} - mvn:org.opendaylight.controller/shutdown-api/${project.version} - mvn:org.opendaylight.controller/shutdown-impl/${project.version} - mvn:org.osgi/org.osgi.core/${osgi.core.version} - wrap:mvn:com.google.guava/guava/${guava.version} - mvn:org.javassist/javassist/${javassist.version} - + + yangtools-concepts + yangtools-binding + yangtools-binding-generator + odl-mdsal-commons + mvn:org.opendaylight.controller/config-api/${project.version} + mvn:org.opendaylight.controller/config-util/${project.version} + mvn:org.opendaylight.controller/config-manager/${project.version} + mvn:org.opendaylight.controller/yang-jmx-generator/${project.version} + mvn:org.opendaylight.controller/config-persister-api/${project.version} + mvn:org.opendaylight.controller/config-persister-file-xml-adapter/${project.version} + mvn:org.opendaylight.controller/config-persister-directory-xml-adapter/${project.version} + mvn:org.opendaylight.controller/shutdown-api/${project.version} + mvn:org.opendaylight.controller/shutdown-impl/${project.version} + mvn:org.osgi/org.osgi.core/${osgi.core.version} + wrap:mvn:com.google.guava/guava/${guava.version} + mvn:org.javassist/javassist/${javassist.version} + \ No newline at end of file diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index 76fbd7f6e5..a8a4c87a4e 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -1,5 +1,4 @@ - 4.0.0 diff --git a/opendaylight/distribution/opendaylight-karaf/pom.xml b/opendaylight/distribution/opendaylight-karaf/pom.xml index d8f6ba1526..221bfa78e8 100644 --- a/opendaylight/distribution/opendaylight-karaf/pom.xml +++ b/opendaylight/distribution/opendaylight-karaf/pom.xml @@ -54,6 +54,13 @@ + + org.opendaylight.controller + extras-features + ${project.version} + kar + runtime + org.opendaylight.controller config-features diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index ef3b5f4fd9..d238ee75cc 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -842,6 +842,10 @@ org.opendaylight.controller config-manager + + org.opendaylight.controller + config-util + org.opendaylight.controller config-netconf-connector @@ -1060,10 +1064,6 @@ org.opendaylight.controller.model model-flow-base - - org.opendaylight.controller.model - model-flow-management - org.opendaylight.controller.model model-flow-service diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index f05afbb346..b2fc3cb386 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -113,8 +113,8 @@ org.apache.tomcat.util.buf.UDecoder.ALLOW_ENCODED_SLASH=true ovsdb.listenPort=6640 # ovsdb creates Openflow nodes/bridges. This configuration configures the bridge's Openflow version. -# default Openflow version = 1.0, we also support 1.3. -# ovsdb.of.version=1.3 +# default Openflow version = 1.3, we also support 1.0. +ovsdb.of.version=1.3 # TLS configuration # To enable TLS, set secureChannelEnabled=true and specify the location of controller Java KeyStore and TrustStore files. @@ -149,3 +149,6 @@ hosttracker.keyscheme=IP lisp.mappingOverwrite = true # Enable the Solicit-Map-Request (SMR) mechanism lisp.smr = false + +#RESTConf websocket listen port (default is 8181) +restconf.websocket.port=8181 diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml index 00abf6cf33..c148b83a7a 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/cors-config.xml @@ -7,48 +7,61 @@ --> - - - CorsFilter - org.apache.catalina.filters.CorsFilter - - cors.allowed.origins - * - - - cors.allowed.methods - GET,POST,HEAD,OPTIONS,PUT,DELETE - - - cors.allowed.headers - Content-Type,X-Requested-With,accept,authorization, - origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers - - - - cors.exposed.headers - Access-Control-Allow-Origin,Access-Control-Allow-Credentials - - - cors.support.credentials - true - - - cors.preflight.maxage - 10 - - + + + CorsFilter + org.apache.catalina.filters.CorsFilter + + cors.allowed.origins + * + + + cors.allowed.methods + GET,POST,HEAD,OPTIONS,PUT,DELETE + + + cors.allowed.headers + Content-Type,X-Requested-With,accept,authorization, + origin,Origin,Access-Control-Request-Method,Access-Control-Request-Headers + + + + cors.exposed.headers + Access-Control-Allow-Origin,Access-Control-Allow-Credentials + + + cors.support.credentials + true + + + cors.preflight.maxage + 10 + + + + + + CorsFilter + + + + + CorsFilter + /* + + + + + + CorsFilter + + + + + CorsFilter + /* + + - - - CorsFilter - - - - - CorsFilter - /* - - diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml index d1a5dcc416..94a3702fdb 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml @@ -86,6 +86,10 @@ + + + + diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/flow/types/port/rev130925/PortNumberBuilder.java b/opendaylight/md-sal/model/model-flow-base/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/flow/types/port/rev130925/PortNumberBuilder.java new file mode 100644 index 0000000000..ff78a7478d --- /dev/null +++ b/opendaylight/md-sal/model/model-flow-base/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/flow/types/port/rev130925/PortNumberBuilder.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925; +import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.CommonPort.PortNumber; + + +public class PortNumberBuilder { + + public static PortNumber getDefaultInstance(java.lang.String defaultValue) { + try { + long uint32 = Long.parseLong(defaultValue); + return new PortNumber(uint32); + } catch(NumberFormatException e){ + return new PortNumber(defaultValue); + } + } + +} diff --git a/opendaylight/md-sal/model/model-flow-management/pom.xml b/opendaylight/md-sal/model/model-flow-management/pom.xml deleted file mode 100644 index 64f115816d..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - - org.opendaylight.controller.model - model-parent - 1.1-SNAPSHOT - - model-flow-management - bundle - - - - ${project.groupId} - model-flow-base - ${project.version} - - - ${project.groupId} - model-inventory - ${project.version} - - - org.opendaylight.yangtools.model - opendaylight-l2-types - - - - scm:git:ssh://git.opendaylight.org:29418/controller.git - scm:git:ssh://git.opendaylight.org:29418/controller.git - HEAD - https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL - - diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang deleted file mode 100644 index b8579bcf9c..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang +++ /dev/null @@ -1,30 +0,0 @@ -module flow-management { - namespace "urn:opendaylight:flow:config"; - prefix flow-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import opendaylight-flow-types {prefix flow;} - - revision "2013-08-19" { - description "Initial revision of flow service"; - } - - - grouping flow-entry { - leaf node { - type inv:node-ref; - } - uses flow:flow; - } - - container flows { - list flow { - key "node id"; - - leaf id { - type uint32; - } - uses flow-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang deleted file mode 100644 index 814c7e4767..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang +++ /dev/null @@ -1,30 +0,0 @@ -module group-management { - namespace "urn:opendaylight:group:config"; - prefix group-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import opendaylight-group-types {prefix group;} - - revision "2013-10-24" { - description "Initial revision of group service"; - } - - grouping group-entry { - leaf node { - type inv:node-ref; - } - uses group:group; - } - - container groups { - list group { - key "id node"; - - leaf id { - type uint32; - } - - uses group-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang deleted file mode 100644 index 6d86c50314..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang +++ /dev/null @@ -1,30 +0,0 @@ -module meter-management { - namespace "urn:opendaylight:meter:config"; - prefix meter-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import opendaylight-meter-types {prefix meter;} - - revision "2013-10-24" { - description "Initial revision of meter service"; - } - - grouping meter-entry { - leaf node { - type inv:node-ref; - } - uses meter:meter; - } - - container meters { - list meter { - key "id node"; - - leaf id { - type uint32; - } - - uses meter-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang deleted file mode 100644 index 77483de148..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang +++ /dev/null @@ -1,30 +0,0 @@ -module port-management { - namespace "urn:opendaylight:port:config"; - prefix port-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import opendaylight-port-types {prefix port;} - - revision "2013-10-24" { - description "Initial revision of port service"; - } - - grouping port-entry { - leaf node { - type inv:node-ref; - } - uses port:port-mod; - } - - container ports { - list port { - key "id node"; - - leaf id { - type uint32; - } - - uses port-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang deleted file mode 100644 index c8a7fbbaa3..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang +++ /dev/null @@ -1,33 +0,0 @@ -module queue-management { - namespace "urn:opendaylight:queue:config"; - prefix queue-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - - import opendaylight-queue-types {prefix queue; revision-date "2013-09-25";} - - - revision "2013-10-24" { - description "Initial revision of queue service"; - } - - grouping queue-entry { - leaf node { - type inv:node-connector-ref; - - } - uses queue:queue-config-request; - } - - container queues { - list queue { - key "id node"; - - leaf id { - type uint32; - } - - uses queue-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang deleted file mode 100644 index 06edb04a0a..0000000000 --- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang +++ /dev/null @@ -1,32 +0,0 @@ -module table-management { - namespace "urn:opendaylight:table:config"; - prefix table-cfg; - - import opendaylight-inventory {prefix inv;revision-date "2013-08-19";} - import opendaylight-table-types {prefix table;} - - revision "2013-10-24" { - description "Initial revision of table service"; - } - - grouping table-entry { - - leaf node { - type inv:node-ref; - } - - uses table:table-features; - } - - container tables { - list table { - key "id node"; - - leaf id { - type uint32; - } - - uses table-entry; - } - } -} diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/node-errors.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/node-errors.yang index a8eec26936..69db856b73 100644 --- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/node-errors.yang +++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/node-errors.yang @@ -73,7 +73,6 @@ module node-error { uses tr:transaction-metadata; uses flow:base-node-error-notification; uses flow:node-error-reference; - uses flow:node-error-reference; } notification group-mod-error-notification { diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml index 12b5f76625..5e6a86745c 100644 --- a/opendaylight/md-sal/model/pom.xml +++ b/opendaylight/md-sal/model/pom.xml @@ -17,7 +17,6 @@ model-flow-base model-flow-service model-flow-statistics - model-flow-management model-topology diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml index 24dcfad02b..d3f6d2d005 100644 --- a/opendaylight/md-sal/pom.xml +++ b/opendaylight/md-sal/pom.xml @@ -63,9 +63,11 @@ sal-protocolbuffer-encoding - - feature + + feature + + sal-test-model diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java index 4327451d21..bcbd6879d0 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareConsumer.java @@ -10,17 +10,64 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext; /** - * - * Defines the component of controller and supplies additional metadata. A - * component of the controller or application supplies a concrete implementation - * of this interface. - * - * A user-implemented component (application) which facilitates the SAL and SAL - * services to access infrastructure services or providers' functionality. - * - * - * - */ +* +* A developer implemented component that gets registered with the Broker. +* +* Semantically, a consumer may: +* +*
    +*
  1. Subscribe for Notifications
    2. +*
  2. Invoke RPCs
    3. +*
  3. Read from either the operational or config data tree
    4. +*
  4. Write to the config data tree
    5. +*
+* If you need to: +*
    +*
  1. Emit Notifications
    2. +*
  2. Provide the implementation of RPCs
    3. +*
  3. Write to the operational data tree
    4. +*
+* +* Consider using a BindingAwareProvider +* +* Examples: +* +* To get a NotificationService: +* +* {code +* public void onSessionInitiated(ProviderContext session) { +* NotificationProviderService notificationService = session.getSALService(NotificationProviderService.class); +* notificationService.publish(notification) +* } +* where notification is an instance of a modeled Notification. +* For more information on sending notifications via the NotificationProviderService +* @see org.opendaylight.controller.sal.binding.api.NotificationProviderService +* +* +* A consumer can *invoke* and RPC ( ie, call foo(fooArgs)) but it cannot register an RPC +* implementation with the MD-SAL that others can invoke(call). +* To get an invokable RPC: +* +* {code +* public void onSessionInitiated(ProviderContext session) { +* MyService rpcFlowSalService = session.getRpcService(MyService.class); +* } +* +* Where MyService.class is a Service interface generated from a yang model with RPCs modeled in it. The returned +* rpcFlowSalService can be used like any other object by invoking its methods. Note, nothing special needs to be done +* for RoutedRPCs. They just work. +* +* To get a DataBroker to allow access to the data tree: +* +* {code +* public void onSessionInitiated(final ProviderContext session) { +* DataBroker databroker = session.getSALService(BindingDataBroker.class); +* } +* } +* @see org.opendaylight.controller.md.sal.common.api.data.BindingDataBroker +* for more info on using the DataBroker. +* +*/ public interface BindingAwareConsumer { /** diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java index 0812e5f53c..cb26cad2f3 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/BindingAwareProvider.java @@ -15,37 +15,131 @@ import org.opendaylight.yangtools.yang.binding.RpcService; /** * - * Defines the component of controller and supplies additional metadata. A - * component of the controller or application supplies a concrete implementation - * of this interface. + * A developer implemented component that gets registered with the Broker. * + * Semantically, a provider may: + * + *
    + *
  1. Emit Notifications
    2. + *
  2. Provide the implementation of RPCs
    3. + *
  3. Write to the operational data tree
    4. + *
+ * + * If a class is not doing at least one of those three, consider using + * a BindingAwareConsumer instead: + * @see org.opendaylight.controller.sal.binding.api.BindingAwareConsumer + * + *

+ * + *In addition, a BindingAwareProvider can in pursuit of its goals: + * + *

    + *
  1. Subscribe for Notifications
    2. + *
  2. Invoke RPCs
    3. + *
  3. Read from either the operational or config data tree
    4. + *
  4. Write to the config data tree
    5. + *
+ * (All of the above are things a Consumer can also do). + * + *

+ * + * Examples: + * + *

+ * + * To get a NotificationService: + * + * {code + * public void onSessionInitiated(ProviderContext session) { + * NotificationProviderService notificationService = session.getSALService(NotificationProviderService.class); + * } + * For more information on sending notifications via the NotificationProviderService + * @see org.opendaylight.controller.sal.binding.api.NotificationProviderService + * + * To register an RPC implementation: + * + * {code + * public void onSessionInitiated(ProviderContext session) { + * RpcRegistration registration = session.addRpcImplementation(MyService.class, myImplementationInstance); + * } + * + *

+ * + * Where MyService.class is a Service interface generated from a yang model with RPCs modeled in it and myImplementationInstance + * is an instance of a class that implements MyService. + * + * To register a Routed RPC Implementation: + * {code + * public void onSessionInitiated(ProviderContext session) { + * RoutedRpcRegistration flowRegistration = session.addRoutedRpcImplementation(SalFlowService.class, salFlowServiceImplementationInstance); + flowRegistration.registerPath(NodeContext.class, nodeInstanceId); + * } + * } + * + * Where SalFlowService.class is a Service interface generated from a yang model with RPCs modeled in it and salFlowServiceImplementationInstance is an instance + * of a class that implements SalFlowService. *

- * A user-implemented component (application) which facilitates the SAL and SAL - * services to access infrastructure services and to provide functionality to - * {@link Consumer}s and other providers. + * The line: + * {code + * flowRegistration.registerPath(NodeContext.class, nodeInstanceId); + * } + * Is indicating that the RPC implementation is registered to handle RPC invocations that have their NodeContext pointing to the node with instance id nodeInstanceId. + * This bears a bit of further explanation. RoutedRPCs can be 'routed' to an implementation based upon 'context'. 'context' is a pointer (instanceId) to some place + * in the data tree. In this example, the 'context' is a pointer to a Node. In this way, a provider can register its ability to provide a service for a particular + * Node, but not *all* Nodes. The Broker routes the RPC by 'context' to the correct implementation, without the caller having to do extra work. Because of this when + * a RoutedRPC is registered, it needs to also be able to indicate for which 'contexts' it is providing an implementation. + * + * An example of a Routed RPC would be an updateFlow(node, flow) that would be routed based on node to the provider which had registered to provide + * it *for that node*. + * + *

* + * To get a DataBroker to allow access to the data tree: + * + * {code + * public void onSessionInitiated(final ProviderContext session) { + * DataBroker databroker = session.getSALService(BindingDataBroker.class); + * } + * } + * @see org.opendaylight.controller.md.sal.common.api.data.BindingDataBroker + * for more info on using the DataBroker. * */ public interface BindingAwareProvider { /** - * Returns a set of provided implementations of YANG modules and their rpcs. + * @deprecated * + * This interface was originally intended to solve problems of how to get Implementations + * of functionality from a provider, but that is no longer necessary because the Provider + * Registers RPCs in onSessionInitiated. * - * @return Set of provided implementation of YANG modules and their Rpcs + * Recommend: + * {code + * public Collection getImplementations() { + * return Collections.emptySet(); + * } + * } */ + @Deprecated Collection getImplementations(); /** - * Gets a set of implementations of provider functionality to be registered - * into system during the provider registration to the SAL. + * @deprecated * - *

- * This method is invoked by {@link Broker#registerProvider(Provider)} to - * learn the initial provided functionality + * This interface was originally intended to solve problems of how to get Functionality + * a provider could provide, but that is no longer necessary because the Provider + * Registers RPCs in onSessionInitiated. + * + * Recommend: + * {code + * public Collection getFunctionality() { + * return Collections.emptySet(); + * } + * } * - * @return Set of provider's functionality. */ + @Deprecated Collection getFunctionality(); /** @@ -58,12 +152,38 @@ public interface BindingAwareProvider { * * */ + @Deprecated public interface ProviderFunctionality { } - + /** + * Callback signaling initialization of the consumer session to the SAL. + * + * The consumer MUST use the session for all communication with SAL or + * retrieving SAL infrastructure services. + * + * This method is invoked by + * {@link BindingAwareBroker#registerProvider(BindingAwareProvider)} + * + * @param session Unique session between consumer and SAL. + */ void onSessionInitiated(ProviderContext session); + /* + * @deprecated + * + * A provider was at one point considered an extension of a consumer, thus this + * call. It is deprecated and the @see org.opendaylight.controller.sal.binding.api.BindingAwareConsumer#onSessionInitiated + * used, or you should simply use {@link #onSessionInitiated(ProviderContext)} + * + * Recommend: + * {code + * public final void onSessionInitialized(ConsumerContext session) { + * // NOOP - as method is deprecated + * } + * } + */ + @Deprecated void onSessionInitialized(ConsumerContext session); } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java index 9429d3f8fa..be8e0cefc1 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationListener.java @@ -12,20 +12,20 @@ import java.util.EventListener; import org.opendaylight.yangtools.yang.binding.Notification; /** - * Interface implemented by objects interested in some sort of Notification. This - * class acts as a base interface for specific listeners which usually are a type + * Interface for a generic listener that is interested in receiving YANG modeled notifications. + * This interface acts as a base interface for specific listeners which usually are a type * capture of this interface. * - * @param Notification type + * @param the interested notification type */ public interface NotificationListener extends EventListener { /** - * Invoked to deliver the notification. Note that this method may be invoked - * from a shared thread pool, so implementations SHOULD NOT perform CPU-intensive - * operations and they definitely MUST NOT invoke any potentially blocking - * operations. + * Invoked to deliver a notification. + *

+ * Note that this method may be invoked from a shared thread pool, so implementations SHOULD NOT + * perform CPU-intensive operations and MUST NOT invoke any potentially blocking operations. * - * @param notification Notification being delivered. + * @param notification the notification. */ void onNotification(T notification); } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java index b94695b83d..00db80c19f 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationProviderService.java @@ -14,29 +14,62 @@ import org.opendaylight.controller.md.sal.common.api.notify.NotificationPublishS import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.Notification; +/** + * Interface for a notification service that provides publish/subscribe capabilities for YANG + * modeled notifications. This interface is a combination of the {@link NotificationService} and + * {@link NotificationPublishService} interfaces. + */ public interface NotificationProviderService extends NotificationService, NotificationPublishService { + /** - * Publishes a notification. - * - * @param Notification - * notification to publish. - * + * {@inheritDoc} */ @Override - void publish(Notification notification); + public void publish(Notification notification); /** - * Publishes a notification, listener calls are done in provided executor. - * + * {@inheritDoc} */ @Override - void publish(Notification notification, ExecutorService service); + void publish(Notification notification, ExecutorService executor); + /** + * Registers a listener to be notified about notification subscriptions. This + * enables a component to know when there is a notification listener subscribed + * for a particular notification type. + *

+ * On registration of this listener, the + * {@link NotificationInterestListener#onNotificationSubscribtion(Class)} method + * will be invoked for every notification type that currently has a notification listener + * subscribed. + * + * @param interestListener the listener that will be notified when subscriptions + * for new notification types occur. + * @return a {@link ListenerRegistration} instance that should be used to unregister the listener + * by invoking the {@link ListenerRegistration#close()} method when no longer needed. + */ ListenerRegistration registerInterestListener( NotificationInterestListener interestListener); + /** + * Interface for a listener interested in being notified about notification subscriptions. + */ public interface NotificationInterestListener extends EventListener { + /** + * Callback that is invoked when a notification listener subscribes for a + * particular notification type. + *

+ * This method is only called for the first subscription that occurs for a + * particular notification type. Subsequent subscriptions for the same + * notification type do not trigger invocation of this method. + *

+ * Note:This callback is delivered from thread not owned by this listener, + * all processing should be as fast as possible and implementations should + * not do any blocking calls or block this thread. + * + * @param notificationType the notification type for the subscription that occurred. + */ void onNotificationSubscribtion(Class notificationType); } } diff --git a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java index 46e372aea6..335f55bcbb 100644 --- a/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java +++ b/opendaylight/md-sal/sal-binding-api/src/main/java/org/opendaylight/controller/sal/binding/api/NotificationService.java @@ -10,24 +10,108 @@ package org.opendaylight.controller.sal.binding.api; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.Notification; +/** + * Notification broker which allows clients to subscribe for and publish YANG-modeled notifications. + * + *

+ * Two styles of listeners are supported: + *

    + *
  • Generic listener
    • + *
  • Dispatch listener - listener, which implements {ModelName}Listener interface, + * which has dispatch methods for each defined notification. Methods are invoked based on notification type (class). + *
    • + * + *

    Generic Listener

    + *

    + * A generic listener implements the {@link NotificationListener} interface which has one callback method + * onNotification that is invoked for any notification type the listener is subscribed to. + *

    + * A generic listener is subscribed using the {@link #registerNotificationListener(Class, NotificationListener)} + * method by which you specify the type of notification to receive. A generic listener may be registered for + * multiple notification types via multiple subscriptions. + *

    + * Generic listeners allow for a more flexible approach, allowing you to subscribe for just + * one type of notification from a YANG model. You could also have a general subscription + * for all notification in the system via + * 

    + *   service.registerNotificationListener(Notification.class, listener);
+ *
    + * + *

    Dispatch Listener

    + *

    + * A dispatch listener implements a YANG-generated module interface {ModuleName}Listener + * which handles all the notifications defined in the YANG model. Each notification type translates to + * a specific method of the form on{NotificationType} on the generated interface. + * The generated interface also extends the + * {@link org.opendaylight.yangtools.yang.binding.NotificationListener} interface and implementations + * are registered using {@link #registerNotificationListener(org.opendaylight.yangtools.yang.binding.NotificationListener)} + * method. + * + *

    Dispatch Listener Example
    + *

    + * Lets assume we have following YANG model: + * + * 

    + * module example {
+ *      ...
+ *
+ *      notification start {
+ *          ...
+ *      }
+ *
+ *      notification stop {
+ *           ...
+ *      }
+ * }
+ *
    + * + * The generated interface will be: + * 
    + *  public interface ExampleListener extends NotificationListener {
+ *      void onStart(Start notification);
+ *      void onStop(Stop notification);
+ *  }
+ *
    + * The following defines an implementation of the generated interface: + * 
    + *  public class MyExampleListener implements ExampleListener {
+ *      public void onStart(Start notification) {
+ *          // do something
+ *      }
+ *
+ *      public void onStop(Stop notification) {
+ *          // do something
+ *      }
+ *  }
+ *
    + * The implementation is registered as follows: + * 
    + *  MyExampleListener listener = new MyExampleListener();
+ *  ListenerRegistration reg = service.registerNotificationListener( listener );
+ *
    + * The onStart method will be invoked when someone publishes a Start notification and + * the onStop method will be invoked when someone publishes a Stop notification. + */ public interface NotificationService extends BindingAwareService { /** - * Register a generic listener for specified notification type only. + * Registers a generic listener implementation for a specified notification type. * - * @param notificationType - * @param listener - * @return Registration for listener. To unregister listener invoke {@link ListenerRegistration#close()} method. + * @param notificationType the YANG-generated interface of the notification type. + * @param listener the listener implementation that will receive notifications. + * @return a {@link ListenerRegistration} instance that should be used to unregister the listener + * by invoking the {@link ListenerRegistration#close()} method when no longer needed. */ ListenerRegistration> registerNotificationListener( Class notificationType, NotificationListener listener); /** - * Register a listener which implements generated notification interfaces derived from + * Registers a listener which implements a YANG-generated notification interface derived from * {@link org.opendaylight.yangtools.yang.binding.NotificationListener}. - * Listener is registered for all notifications present in implemented interfaces. + * The listener is registered for all notifications present in the implemented interface. * - * @param listener - * @return Registration for listener. To unregister listener invoke {@link ListenerRegistration#close()} method. + * @param listener the listener implementation that will receive notifications. + * @return a {@link ListenerRegistration} instance that should be used to unregister the listener + * by invoking the {@link ListenerRegistration#close()} method when no longer needed. */ ListenerRegistration registerNotificationListener( org.opendaylight.yangtools.yang.binding.NotificationListener listener); diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml index 35b186db6a..74cceb1cbd 100644 --- a/opendaylight/md-sal/sal-binding-broker/pom.xml +++ b/opendaylight/md-sal/sal-binding-broker/pom.xml @@ -79,11 +79,6 @@ org.opendaylight.yangtools.model ietf-inet-types - - org.reflections - reflections - compile - org.slf4j slf4j-api @@ -113,10 +108,14 @@ ietf-topology-l3-unicast-igp test + + org.opendaylight.controller + sal-test-model + test + org.slf4j slf4j-simple - ${slf4j.version} test diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java index b109f89ff6..58d78a85dc 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractForwardedDataBroker.java @@ -187,7 +187,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator, DataObject> createdCache; private Map, DataObject> updatedCache; - private Map, ? extends DataObject> originalCache; + private Map, DataObject> originalCache; private Set> removedCache; private Optional originalDataCache; private Optional updatedDataCache; @@ -225,7 +225,7 @@ public abstract class AbstractForwardedDataBroker implements Delegator, ? extends DataObject> getOriginalData() { + public Map, DataObject> getOriginalData() { if (originalCache == null) { originalCache = Collections.unmodifiableMap(toBinding(domEvent.getOriginalData())); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java index 5ce66874b1..9eceeb1e43 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/AbstractWriteTransaction.java @@ -7,18 +7,23 @@ */ package org.opendaylight.controller.md.sal.binding.impl; +import java.util.Collections; import java.util.Map.Entry; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction; import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.Identifiable; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Optional; +import com.google.common.collect.Iterables; import com.google.common.util.concurrent.ListenableFuture; /** @@ -38,15 +43,76 @@ public class AbstractWriteTransaction extends protected final void doPut(final LogicalDatastoreType store, final InstanceIdentifier path, final DataObject data) { - final Entry> normalized = getCodec() + final Entry> normalized = getCodec() .toNormalizedNode(path, data); + ensureListParentIfNeeded(store,path,normalized); getDelegate().put(store, normalized.getKey(), normalized.getValue()); } + + /** + * + * Ensures list parent if item is list, otherwise noop. + * + *

    + * One of properties of binding specification is that it is imposible + * to represent list as a whole and thus it is impossible to write + * empty variation of MapNode without creating parent node, with + * empty list. + * + *

    + * This actually makes writes such as + * 

    +     * put("Nodes", new NodesBuilder().build());
+     * put("Nodes/Node[key]", new NodeBuilder().setKey("key").build());
+     *
    + * To result in three DOM operations: + * 
    +     * put("/nodes",domNodes);
+     * merge("/nodes/node",domNodeList);
+     * put("/nodes/node/node[key]",domNode);
+     *
    + * + * + * In order to allow that to be inserted if necessary, if we know + * item is list item, we will try to merge empty MapNode or OrderedNodeMap + * to ensure list exists. + * + * @param store Data Store type + * @param path Path to data (Binding Aware) + * @param normalized Normalized version of data to be written + */ + private void ensureListParentIfNeeded(final LogicalDatastoreType store, final InstanceIdentifier path, + final Entry> normalized) { + if(Identifiable.class.isAssignableFrom(path.getTargetType())) { + org.opendaylight.yangtools.yang.data.api.InstanceIdentifier parentMapPath = getParent(normalized.getKey()).get(); + NormalizedNode emptyParent = getCodec().getDefaultNodeFor(parentMapPath); + getDelegate().merge(store, parentMapPath, emptyParent); + } + + } + + // FIXME (should be probaly part of InstanceIdentifier) + protected static Optional getParent( + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier child) { + + Iterable mapEntryItemPath = child.getPathArguments(); + int parentPathSize = Iterables.size(mapEntryItemPath) - 1; + if(parentPathSize > 1) { + return Optional.of(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.create(Iterables.limit(mapEntryItemPath, parentPathSize))); + } else if(parentPathSize == 0) { + return Optional.of(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.create(Collections.emptyList())); + } else { + return Optional.absent(); + } + } + protected final void doMerge(final LogicalDatastoreType store, final InstanceIdentifier path, final DataObject data) { + final Entry> normalized = getCodec() .toNormalizedNode(path, data); + ensureListParentIfNeeded(store,path,normalized); getDelegate().merge(store, normalized.getKey(), normalized.getValue()); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java index 6b519955ac..d275c838f2 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingToNormalizedNodeCodec.java @@ -8,11 +8,11 @@ package org.opendaylight.controller.md.sal.binding.impl; import java.lang.reflect.Method; -import java.lang.reflect.Type; import java.util.AbstractMap.SimpleEntry; -import java.util.LinkedList; -import java.util.List; +import java.util.HashSet; +import java.util.Iterator; import java.util.Map.Entry; +import java.util.Set; import javax.annotation.Nullable; @@ -20,13 +20,13 @@ import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizat import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizationOperation; import org.opendaylight.controller.md.sal.common.impl.util.compat.DataNormalizer; import org.opendaylight.yangtools.yang.binding.Augmentation; -import org.opendaylight.yangtools.yang.binding.DataContainer; +import org.opendaylight.yangtools.yang.binding.BindingMapping; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.Item; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.binding.util.BindingReflections; -import org.opendaylight.yangtools.yang.binding.util.ClassLoaderUtils; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.AugmentationIdentifier; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifier; @@ -39,6 +39,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; import org.opendaylight.yangtools.yang.data.impl.codec.DeserializationException; import org.opendaylight.yangtools.yang.data.impl.schema.Builders; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; +import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; +import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; import org.slf4j.Logger; @@ -47,7 +50,7 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; -import com.google.common.base.Supplier; +import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; @@ -98,8 +101,8 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { if (child instanceof AugmentationNode) { ImmutableList childArgs = ImmutableList. builder() .addAll(normalizedEntry.getKey().getPathArguments()).add(child.getIdentifier()).build(); - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier childPath = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.create( - childArgs); + org.opendaylight.yangtools.yang.data.api.InstanceIdentifier childPath = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier + .create(childArgs); return toDOMEntry(childPath, child); } } @@ -120,7 +123,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { */ public Optional> toBinding( final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) - throws DeserializationException { + throws DeserializationException { PathArgument lastArgument = Iterables.getLast(normalized.getPathArguments()); // Used instance-identifier codec do not support serialization of last @@ -137,7 +140,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { private Optional> toBindingAugmented( final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) - throws DeserializationException { + throws DeserializationException { Optional> potential = toBindingImpl(normalized); // Shorthand check, if codec already supports deserialization // of AugmentationIdentifier we will return @@ -187,7 +190,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { private Optional> toBindingImpl( final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) - throws DeserializationException { + throws DeserializationException { org.opendaylight.yangtools.yang.data.api.InstanceIdentifier legacyPath; try { @@ -206,10 +209,10 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { private boolean isNotRepresentable(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) throws DataNormalizationException { DataNormalizationOperation op = findNormalizationOperation(normalized); - if( op.isMixin() && op.getIdentifier() instanceof NodeIdentifier) { + if (op.isMixin() && op.getIdentifier() instanceof NodeIdentifier) { return true; } - if(op.isLeaf()) { + if (op.isLeaf()) { return true; } return false; @@ -217,7 +220,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { private DataNormalizationOperation findNormalizationOperation( final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) - throws DataNormalizationException { + throws DataNormalizationException { DataNormalizationOperation current = legacyToNormalized.getRootOperation(); for (PathArgument arg : normalized.getPathArguments()) { current = current.getChild(arg); @@ -233,10 +236,9 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { } private static final Entry> toDOMEntry( - final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier key, - final NormalizedNode value) { - return new SimpleEntry>( - key, value); + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier key, final NormalizedNode value) { + return new SimpleEntry>(key, + value); } public DataObject toBinding(final InstanceIdentifier path, final NormalizedNode normalizedNode) @@ -262,7 +264,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { public Optional, DataObject>> toBinding( final Entry> normalized) - throws DeserializationException { + throws DeserializationException { Optional> potentialPath = toBinding(normalized.getKey()); if (potentialPath.isPresent()) { InstanceIdentifier bindingPath = potentialPath.get(); @@ -289,27 +291,155 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { if (isAugmentationIdentifier(processed)) { return processed; } - // Here we employ small trick - DataNormalizer injects augmentation - // identifier if child is - // also part of the path (since using a child we can safely identify - // augmentation) - // so, we scan augmentation for children add it to path - // and use original algorithm, then shorten it to last augmentation - for (@SuppressWarnings("rawtypes") - Class augChild : getAugmentationChildren(augPath.getTargetType())) { + Optional additionalSerialized; + additionalSerialized = toNormalizedAugmentedUsingChildContainers(augPath, processed); + + if (additionalSerialized.isPresent()) { + return additionalSerialized.get(); + } + additionalSerialized = toNormalizedAugmentedUsingChildLeafs(augPath, processed); + if (additionalSerialized.isPresent()) { + return additionalSerialized.get(); + } + throw new IllegalStateException("Unabled to construct augmentation identfier for " + augPath); + } + + /** + * Tries to find correct augmentation identifier using children leafs + * + * This method uses normalized Instance Identifier of parent node to fetch + * schema and {@link BindingReflections#getModuleInfo(Class)} to learn about + * augmentation namespace, specificly, in which module it was defined. + * + * Then it uses it to filter all available augmentations for parent by + * module. After that it walks augmentations in particular module and + * pick-up first which at least one leaf name matches supplied augmentation. + * We could do this safely since YANG explicitly states that no any existing + * augmentations must differ in leaf fully qualified names. + * + * + * @param augPath + * Binding Aware Path which ends with augment + * @param parentPath + * Processed path + * @return + */ + private Optional toNormalizedAugmentedUsingChildLeafs( + final InstanceIdentifier augPath, + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier parentPath) { + try { + DataNormalizationOperation parentOp = legacyToNormalized.getOperation(parentPath); + if(!parentOp.getDataSchemaNode().isPresent()) { + return Optional.absent(); + } + DataSchemaNode parentSchema = parentOp.getDataSchemaNode().get(); + if (parentSchema instanceof AugmentationTarget) { + Set augmentations = ((AugmentationTarget) parentSchema).getAvailableAugmentations(); + LOG.info("Augmentations for {}, {}", augPath, augmentations); + Optional schema = findAugmentation(augPath.getTargetType(), augmentations); + if (schema.isPresent()) { + AugmentationIdentifier augmentationIdentifier = DataNormalizationOperation + .augmentationIdentifierFrom(schema.get()); + return Optional.of(parentPath.node(augmentationIdentifier)); + } + } + } catch (DataNormalizationException e) { + throw new IllegalArgumentException(e); + } + return Optional.absent(); + } + + /** + * Creates instance identifier for augmentation child, tries to serialize it + * Instance Identifier is then shortened to last augmentation. + * + * This is for situations, where underlying codec is implementing hydrogen + * style DOM APIs (which did not supported {@link AugmentationIdentifier}.) + * + * @param augPath + * @param parentPath + * Path to parent node + * @return + */ + @SuppressWarnings("rawtypes") + private Optional toNormalizedAugmentedUsingChildContainers( + final InstanceIdentifier augPath, + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier parentPath) { + for (Class augChild : BindingReflections.getChildrenClasses(augPath.getTargetType())) { @SuppressWarnings("unchecked") InstanceIdentifier childPath = augPath.child(augChild); org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized = toNormalizedImpl(childPath); - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier potentialDiscovered = shortenToLastAugmentation(normalized); + org.opendaylight.yangtools.yang.data.api.InstanceIdentifier potentialDiscovered = shortenToLastAugmentation( + normalized, parentPath); if (potentialDiscovered != null) { - return potentialDiscovered; + return Optional.of(potentialDiscovered); } } - return processed; + return Optional.absent(); + } + + private Optional findAugmentation(final Class targetType, + final Set augmentations) { + YangModuleInfo moduleInfo; + try { + moduleInfo = BindingReflections.getModuleInfo(targetType); + } catch (Exception e) { + throw new IllegalStateException(e); + } + Iterable filtered = filteredByModuleInfo(augmentations, + BindingReflections.getModuleQName(moduleInfo).getModule()); + filtered.toString(); + Set targetTypeGetters = getYangModeledGetters(targetType); + for (AugmentationSchema schema : filtered) { + for (DataSchemaNode child : schema.getChildNodes()) { + String getterName = "get" + BindingMapping.getClassName(child.getQName()); + if (targetTypeGetters.contains(getterName)) { + return Optional.of(schema); + } + } + } + return Optional.absent(); + } + + private static Iterable filteredByModuleInfo(final Iterable augmentations, + final QNameModule module) { + return Iterables.filter(augmentations, new Predicate() { + @Override + public boolean apply(final AugmentationSchema schema) { + final Set childNodes = schema.getChildNodes(); + return !schema.getChildNodes().isEmpty() + && module.equals(Iterables.get(childNodes, 0).getQName().getModule()); + } + }); + } + + public static final Set getYangModeledGetters(final Class targetType) { + HashSet ret = new HashSet(); + for (Method method : targetType.getMethods()) { + if (isYangModeledGetter(method)) { + ret.add(method.getName()); + } + } + return ret; + } + + /** + * + * Returns true if supplied method represent getter for YANG modeled value + * + * @param method + * Method to be tested + * @return true if method represent getter for YANG Modeled value. + */ + private static final boolean isYangModeledGetter(final Method method) { + return !method.getName().equals("getClass") && !method.getName().equals("getImplementedInterface") + && method.getName().startsWith("get") && method.getParameterTypes().length == 0; } private org.opendaylight.yangtools.yang.data.api.InstanceIdentifier shortenToLastAugmentation( - final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized) { + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier normalized, + final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier parentPath) { + int parentSize = Iterables.size(parentPath.getPathArguments()); int position = 0; int foundPosition = -1; for (PathArgument arg : normalized.getPathArguments()) { @@ -318,7 +448,7 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { foundPosition = position; } } - if (foundPosition > 0) { + if (foundPosition > 0 && foundPosition > parentSize) { Iterable shortened = Iterables.limit(normalized.getPathArguments(), foundPosition); return org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.create(shortened); } @@ -347,62 +477,6 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { return normalized; } - @SuppressWarnings("unchecked") - private Iterable> getAugmentationChildren(final Class targetType) { - List> ret = new LinkedList<>(); - for (Method method : targetType.getMethods()) { - Class entity = getYangModeledType(method); - if (entity != null) { - ret.add((Class) entity); - } - } - return ret; - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private Class getYangModeledType(final Method method) { - if (method.getName().equals("getClass") || !method.getName().startsWith("get") - || method.getParameterTypes().length > 0) { - return null; - } - - Class returnType = method.getReturnType(); - if (DataContainer.class.isAssignableFrom(returnType)) { - return (Class) returnType; - } else if (List.class.isAssignableFrom(returnType)) { - try { - return ClassLoaderUtils.withClassLoader(method.getDeclaringClass().getClassLoader(), - new Supplier() { - @Override - public Class get() { - Type listResult = ClassLoaderUtils.getFirstGenericParameter(method - .getGenericReturnType()); - if (listResult instanceof Class - && DataObject.class.isAssignableFrom((Class) listResult)) { - return (Class) listResult; - } - return null; - } - - }); - } catch (Exception e) { - LOG.debug("Could not get YANG modeled entity for {}", method, e); - return null; - } - - } - return null; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - private static InstanceIdentifier toWildcarded(final InstanceIdentifier orig) { - List wildArgs = new LinkedList<>(); - for (org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument arg : orig.getPathArguments()) { - wildArgs.add(new Item(arg.getType())); - } - return InstanceIdentifier.create(wildArgs); - } - private static boolean isAugmentation(final Class type) { return Augmentation.class.isAssignableFrom(type); } @@ -417,26 +491,26 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { private static int getAugmentationCount(final InstanceIdentifier potential) { int count = 0; - for(org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument arg : potential.getPathArguments()) { - if(isAugmentation(arg.getType())) { + for (org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument arg : potential.getPathArguments()) { + if (isAugmentation(arg.getType())) { count++; } - } return count; } private static int getAugmentationCount(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier potential) { int count = 0; - for(PathArgument arg : potential.getPathArguments()) { - if(arg instanceof AugmentationIdentifier) { + for (PathArgument arg : potential.getPathArguments()) { + if (arg instanceof AugmentationIdentifier) { count++; } } return count; } - public Function>, Optional> deserializeFunction(final InstanceIdentifier path) { + public Function>, Optional> deserializeFunction( + final InstanceIdentifier path) { return new DeserializeFunction(this, path); } @@ -470,4 +544,25 @@ public class BindingToNormalizedNodeCodec implements SchemaContextListener { return Optional.absent(); } } + + /** + * Returns an default object according to YANG schema for supplied path. + * + * @param path + * DOM Path + * @return Node with defaults set on. + */ + public NormalizedNode getDefaultNodeFor(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier path) { + Iterator iterator = path.getPathArguments().iterator(); + DataNormalizationOperation currentOp = legacyToNormalized.getRootOperation(); + while (iterator.hasNext()) { + PathArgument currentArg = iterator.next(); + try { + currentOp = currentOp.getChild(currentArg); + } catch (DataNormalizationException e) { + throw new IllegalArgumentException(String.format("Invalid child encountered in path %s", path), e); + } + } + return currentOp.createDefault(path.getLastPathArgument()); + } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/BrokerImplClassLoader.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/BrokerImplClassLoader.java deleted file mode 100644 index fdd9350680..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/BrokerImplClassLoader.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.controller.sal.binding.codegen.impl; - -public class BrokerImplClassLoader extends ClassLoader { - private final ClassLoader spiClassLoader; - - public BrokerImplClassLoader(final ClassLoader model, final ClassLoader spi) { - super(model); - this.spiClassLoader = spi; - } - - @Override - public Class loadClass(final String name) throws ClassNotFoundException { - try { - return super.loadClass(name); - } catch (ClassNotFoundException e) { - return this.spiClassLoader.loadClass(name); - } - } -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend index 00c9f1eb91..834eb4f5fb 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/codegen/impl/RuntimeCodeGenerator.xtend @@ -82,6 +82,12 @@ class RuntimeCodeGenerator extends AbstractRuntimeCodeGenerator { val rpcMeta = metadata.getRpcMethod(name); val bodyTmp = ''' { + if($1 == null) { + throw new IllegalArgumentException("RPC input must not be null and must contain a value for field «rpcMeta.inputRouteGetter.name»"); + } + if($1.«rpcMeta.inputRouteGetter.name»() == null) { + throw new IllegalArgumentException("Field «rpcMeta.inputRouteGetter.name» must not be null"); + } final «InstanceIdentifier.name» identifier = $1.«rpcMeta.inputRouteGetter.name»()«IF rpcMeta. routeEncapsulated».getValue()«ENDIF»; «supertype.name» instance = («supertype.name») «rpcMeta.context.routingTableField».get(identifier); diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java index d2472669fa..6e4b2d8d99 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/BindingIndependentConnector.java @@ -57,10 +57,14 @@ import org.opendaylight.controller.sal.core.api.Broker.RoutedRpcRegistration; import org.opendaylight.controller.sal.core.api.Provider; import org.opendaylight.controller.sal.core.api.RpcImplementation; import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; +import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; import org.opendaylight.controller.sal.core.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.core.api.notify.NotificationListener; import org.opendaylight.controller.sal.core.api.notify.NotificationPublishService; +import org.opendaylight.yangtools.concepts.CompositeObjectRegistration; +import org.opendaylight.yangtools.concepts.CompositeObjectRegistration.CompositeObjectRegistrationBuilder; import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.Augmentable; import org.opendaylight.yangtools.yang.binding.Augmentation; @@ -83,6 +87,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Function; +import com.google.common.base.Optional; import com.google.common.collect.FluentIterable; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; @@ -321,7 +326,10 @@ public class BindingIndependentConnector implements // public void startRpcForwarding() { if (biRpcRegistry != null && baRpcRegistry instanceof RouteChangePublisher) { checkState(!rpcForwarding, "Connector is already forwarding RPCs"); - domToBindingRpcManager = baRpcRegistry.registerRouteChangeListener(new DomToBindingRpcForwardingManager()); + final DomToBindingRpcForwardingManager biFwdManager = new DomToBindingRpcForwardingManager(); + + domToBindingRpcManager = baRpcRegistry.registerRouteChangeListener(biFwdManager); + biRpcRegistry.addRpcRegistrationListener(biFwdManager); if (baRpcRegistry instanceof RpcProviderRegistryImpl) { baRpcRegistryImpl = (RpcProviderRegistryImpl) baRpcRegistry; baRpcRegistryImpl.registerRouterInstantiationListener(domToBindingRpcManager.getInstance()); @@ -486,7 +494,7 @@ public class BindingIndependentConnector implements // public void onRegister( final DataCommitHandlerRegistration, DataObject> registration) { - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier domPath = mappingService.toDataDom(registration + mappingService.toDataDom(registration .getPath()); } @@ -528,7 +536,7 @@ public class BindingIndependentConnector implements // */ private class DomToBindingRpcForwardingManager implements RouteChangeListener>, RouterInstantiationListener, - GlobalRpcRegistrationListener { + GlobalRpcRegistrationListener, RpcRegistrationListener { private final Map, DomToBindingRpcForwarder> forwarders = new WeakHashMap<>(); private RpcProviderRegistryImpl registryImpl; @@ -543,7 +551,7 @@ public class BindingIndependentConnector implements // @Override public void onGlobalRpcRegistered(final Class cls) { - getRpcForwarder(cls, null); + getRpcForwarder(cls, null).registerToDOMBroker(); } @Override @@ -588,31 +596,41 @@ public class BindingIndependentConnector implements // return potential; } + @Override + public void onRpcImplementationAdded(final QName name) { + + final Optional> rpcInterface = mappingService.getRpcServiceClassFor( + name.getNamespace().toString(), name.getFormattedRevision()); + if (rpcInterface.isPresent()) { + getRpcForwarder(rpcInterface.get(), null).registerToBindingBroker(); + } + } + + @Override + public void onRpcImplementationRemoved(final QName name) { + + } } private class DomToBindingRpcForwarder implements RpcImplementation, InvocationHandler { private final Set supportedRpcs; private final WeakReference> rpcServiceType; - private final Set registrations; + private Set registrations; private final Map strategiesByQName = new HashMap<>(); private final WeakHashMap strategiesByMethod = new WeakHashMap<>(); + private final RpcService proxy; + private ObjectRegistration forwarderRegistration; + private boolean registrationInProgress = false; public DomToBindingRpcForwarder(final Class service) { this.rpcServiceType = new WeakReference>(service); this.supportedRpcs = mappingService.getRpcQNamesFor(service); - try { - for (QName rpc : supportedRpcs) { - RpcInvocationStrategy strategy = createInvocationStrategy(rpc, service); - strategiesByMethod.put(strategy.targetMethod, strategy); - strategiesByQName.put(rpc, strategy); - biRpcRegistry.addRpcImplementation(rpc, this); - } - } catch (Exception e) { - LOG.error("Could not forward Rpcs of type {}", service.getName(), e); - } - registrations = ImmutableSet.of(); + Class cls = rpcServiceType.get(); + ClassLoader clsLoader = cls.getClassLoader(); + proxy =(RpcService) Proxy.newProxyInstance(clsLoader, new Class[] { cls }, this); + createStrategies(); } /** @@ -622,16 +640,12 @@ public class BindingIndependentConnector implements // * @param context */ public DomToBindingRpcForwarder(final Class service, - final Class context) { - this.rpcServiceType = new WeakReference>(service); - this.supportedRpcs = mappingService.getRpcQNamesFor(service); + final Class context) { + this(service); Builder registrationsBuilder = ImmutableSet . builder(); try { for (QName rpc : supportedRpcs) { - RpcInvocationStrategy strategy = createInvocationStrategy(rpc, service); - strategiesByMethod.put(strategy.targetMethod, strategy); - strategiesByQName.put(rpc, strategy); registrationsBuilder.add(biRpcRegistry.addRoutedRpcImplementation(rpc, this)); } createDefaultDomForwarder(); @@ -641,6 +655,48 @@ public class BindingIndependentConnector implements // registrations = registrationsBuilder.build(); } + + + private void createStrategies() { + try { + for (QName rpc : supportedRpcs) { + RpcInvocationStrategy strategy = createInvocationStrategy(rpc, rpcServiceType.get()); + strategiesByMethod.put(strategy.targetMethod, strategy); + strategiesByQName.put(rpc, strategy); + } + } catch (Exception e) { + LOG.error("Could not forward Rpcs of type {}", rpcServiceType.get(), e); + } + + } + + /** + * Registers RPC Forwarder to DOM Broker, + * this means Binding Aware Broker has implementation of RPC + * which is registered to it. + * + * If RPC Forwarder was previously registered to DOM Broker + * or to Bidning Broker this method is noop to prevent + * creating forwarding loop. + * + */ + public void registerToDOMBroker() { + if(!registrationInProgress && forwarderRegistration == null) { + registrationInProgress = true; + CompositeObjectRegistrationBuilder builder = CompositeObjectRegistration.builderFor(this); + try { + for (QName rpc : supportedRpcs) { + builder.add(biRpcRegistry.addRpcImplementation(rpc, this)); + } + } catch (Exception e) { + LOG.error("Could not forward Rpcs of type {}", rpcServiceType.get(), e); + } + this.forwarderRegistration = builder.toInstance(); + registrationInProgress = false; + } + } + + public void registerPaths(final Class context, final Class service, final Set> set) { QName ctx = BindingReflections.findQName(context); @@ -737,6 +793,29 @@ public class BindingIndependentConnector implements // }); } + + /** + * Registers RPC Forwarder to Binding Broker, + * this means DOM Broekr has implementation of RPC + * which is registered to it. + * + * If RPC Forwarder was previously registered to DOM Broker + * or to Bidning Broker this method is noop to prevent + * creating forwarding loop. + * + */ + public void registerToBindingBroker() { + if(!registrationInProgress && forwarderRegistration == null) { + try { + registrationInProgress = true; + this.forwarderRegistration = baRpcRegistry.addRpcImplementation((Class)rpcServiceType.get(), proxy); + } catch (Exception e) { + LOG.error("Unable to forward RPCs for {}",rpcServiceType.get(),e); + } finally { + registrationInProgress = false; + } + } + } } public boolean isRpcForwarding() { diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/Constants.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/Constants.java deleted file mode 100644 index 211589fc99..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/Constants.java +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.impl.connect.dom; - -public class Constants { - public static final Class BYTES_CLASS = byte[].class; -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/DataModificationTracker.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/DataModificationTracker.java deleted file mode 100644 index 8278b36551..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/DataModificationTracker.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.impl.connect.dom; - -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import org.opendaylight.controller.md.sal.common.api.data.DataModification; -import org.opendaylight.yangtools.concepts.Path; - -public final class DataModificationTracker

    ,D> { - ConcurrentMap> trackedTransactions = new ConcurrentHashMap<>(); - - public void startTrackingModification(DataModification modification) { - trackedTransactions.putIfAbsent(modification.getIdentifier(), modification); - } - - public boolean containsIdentifier(Object identifier) { - return trackedTransactions.containsKey(identifier); - } -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/package-info.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/package-info.java deleted file mode 100644 index e5f26b9b1d..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/package-info.java +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.impl; \ No newline at end of file diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java deleted file mode 100644 index d22335e66e..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/DelegateProxy.java +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.spi; - -public interface DelegateProxy { - - void setDelegate(T delegate); - T getDelegate(); -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java deleted file mode 100644 index 068c68a81f..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RemoteRpcRouter.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.spi.remote; - -import org.opendaylight.yangtools.concepts.ListenerRegistration; - -public interface RemoteRpcRouter { - - - - - - - ListenerRegistration registerRouteChangeListener(RouteChangeListener listener); - - - - -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RouteChangeListener.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RouteChangeListener.java deleted file mode 100644 index 9e66fb8612..0000000000 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/spi/remote/RouteChangeListener.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.binding.spi.remote; - -import java.util.EventListener; - -import org.opendaylight.controller.md.sal.common.api.routing.RouteChange; -import org.opendaylight.yangtools.yang.binding.BaseIdentity; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public interface RouteChangeListener extends EventListener { - - void onRouteChange(RouteChange, InstanceIdentifier> change); - -} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BindingNormalizedCodecTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BindingNormalizedCodecTest.java new file mode 100644 index 0000000000..6b05b1046f --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/BindingNormalizedCodecTest.java @@ -0,0 +1,58 @@ +package org.opendaylight.controller.md.sal.binding.impl.test; + +import static org.junit.Assert.assertTrue; +import javassist.ClassPool; + +import org.junit.Test; +import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec; +import org.opendaylight.controller.md.sal.binding.test.AbstractSchemaAwareTest; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugment; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeLeafOnlyAugment; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; +import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.AugmentationIdentifier; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; + +public class BindingNormalizedCodecTest extends AbstractSchemaAwareTest { + + private static final TopLevelListKey TOP_FOO_KEY = new TopLevelListKey("foo"); + private static final InstanceIdentifier BA_TOP_LEVEL_LIST = InstanceIdentifier + .builder(Top.class).child(TopLevelList.class, TOP_FOO_KEY).toInstance(); + private static final InstanceIdentifier BA_TREE_LEAF_ONLY = BA_TOP_LEVEL_LIST.augmentation(TreeLeafOnlyAugment.class); + private static final InstanceIdentifier BA_TREE_COMPLEX_USES = BA_TOP_LEVEL_LIST.augmentation(TreeComplexUsesAugment.class); + private static final QName SIMPLE_VALUE_QNAME = QName.create(TreeComplexUsesAugment.QNAME, "simple-value"); + + + private RuntimeGeneratedMappingServiceImpl mappingService; + private BindingToNormalizedNodeCodec codec; + + @Override + protected void setupWithSchema(final SchemaContext context) { + mappingService = new RuntimeGeneratedMappingServiceImpl(ClassPool.getDefault()); + codec = new BindingToNormalizedNodeCodec(mappingService); + mappingService.onGlobalContextUpdated(context); + codec.onGlobalContextUpdated(context); + }; + + @Test + public void testComplexAugmentationSerialization() { + + PathArgument lastArg = codec.toNormalized(BA_TREE_COMPLEX_USES).getLastPathArgument(); + assertTrue(lastArg instanceof AugmentationIdentifier); + } + + + @Test + public void testLeafOnlyAugmentationSerialization() { + + PathArgument leafOnlyLastArg = codec.toNormalized(BA_TREE_LEAF_ONLY).getLastPathArgument(); + assertTrue(leafOnlyLastArg instanceof AugmentationIdentifier); + assertTrue(((AugmentationIdentifier) leafOnlyLastArg).getPossibleChildNames().contains(SIMPLE_VALUE_QNAME)); + } + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java new file mode 100644 index 0000000000..05bc857969 --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/ListInsertionDataChangeListenerTest.java @@ -0,0 +1,193 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.impl.test; +import static org.junit.Assert.assertFalse; +import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertContains; +import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertEmpty; +import static org.opendaylight.controller.md.sal.binding.test.AssertCollections.assertNotContains; +import static org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType.CONFIGURATION; +import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_BAR_KEY; +import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.TOP_FOO_KEY; +import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.top; +import static org.opendaylight.controller.md.sal.test.model.util.ListsBindingUtils.topLevelList; + +import org.junit.Test; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.binding.test.AbstractDataChangeListenerTest; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +/** + * + * This testsuite tests explanation for data change scope and data modifications + * which were described in + * https://lists.opendaylight.org/pipermail/controller-dev/2014-July/005541.html + * + * + */ +public class ListInsertionDataChangeListenerTest extends AbstractDataChangeListenerTest{ + + private static final InstanceIdentifier TOP = InstanceIdentifier.create(Top.class); + private static final InstanceIdentifier WILDCARDED = TOP.child(TopLevelList.class); + private static final InstanceIdentifier TOP_FOO = TOP.child(TopLevelList.class, TOP_FOO_KEY); + private static final InstanceIdentifier TOP_BAR = TOP.child(TopLevelList.class, TOP_BAR_KEY); + + + @Override + protected void setupWithDataBroker(final DataBroker dataBroker) { + WriteTransaction initialTx = dataBroker.newWriteOnlyTransaction(); + initialTx.put(CONFIGURATION, TOP, top(topLevelList(TOP_FOO_KEY))); + assertCommit(initialTx.commit()); + } + + @Test + public void replaceTopNodeSubtreeListeners() { + TestListener topListener = createListener(CONFIGURATION, TOP, DataChangeScope.SUBTREE); + TestListener allListener = createListener(CONFIGURATION, WILDCARDED, DataChangeScope.SUBTREE); + TestListener fooListener = createListener(CONFIGURATION, TOP_FOO, DataChangeScope.SUBTREE); + TestListener barListener = createListener(CONFIGURATION, TOP_BAR, DataChangeScope.SUBTREE); + + ReadWriteTransaction writeTx = getDataBroker().newReadWriteTransaction(); + writeTx.put(CONFIGURATION, TOP, top(topLevelList(TOP_BAR_KEY))); + assertCommit(writeTx.commit()); + AsyncDataChangeEvent, DataObject> top = topListener.event(); + AsyncDataChangeEvent, DataObject> all = allListener.event(); + AsyncDataChangeEvent, DataObject> foo = fooListener.event(); + AsyncDataChangeEvent, DataObject> bar = barListener.event(); + + // Listener for TOP element + assertContains(top.getOriginalData(), TOP,TOP_FOO); + assertContains(top.getCreatedData(), TOP_BAR); + assertContains(top.getUpdatedData(), TOP); + assertContains(top.getRemovedPaths(), TOP_FOO); + + /* + * Listener for all list items + * + * Updated should be empty, since no list item was + * updated, items were only removed and added + */ + assertContains(all.getOriginalData(), TOP_FOO); + assertContains(all.getCreatedData(), TOP_BAR); + assertEmpty(all.getUpdatedData()); + assertContains(all.getRemovedPaths(), TOP_FOO); + + + /* + * Listener for all Foo item + * + * This one should see only Foo item removed + */ + assertContains(foo.getOriginalData(), TOP_FOO); + assertEmpty(foo.getCreatedData()); + assertEmpty(foo.getUpdatedData()); + assertContains(foo.getRemovedPaths(), TOP_FOO); + + /* + * Listener for bar list items + * + * Updated should be empty, since no list item was + * updated, items were only removed and added + */ + assertEmpty(bar.getOriginalData()); + assertContains(bar.getCreatedData(), TOP_BAR); + assertEmpty(bar.getUpdatedData()); + assertEmpty(bar.getRemovedPaths()); + } + + @Test + public void mergeTopNodeSubtreeListeners() { + TestListener topListener = createListener(CONFIGURATION, TOP, DataChangeScope.SUBTREE); + TestListener allListener = createListener(CONFIGURATION, WILDCARDED, DataChangeScope.SUBTREE); + TestListener fooListener = createListener(CONFIGURATION, TOP_FOO, DataChangeScope.SUBTREE); + TestListener barListener = createListener(CONFIGURATION, TOP_BAR, DataChangeScope.SUBTREE); + + ReadWriteTransaction writeTx = getDataBroker().newReadWriteTransaction(); + writeTx.merge(CONFIGURATION, TOP, top(topLevelList(TOP_BAR_KEY))); + assertCommit(writeTx.commit()); + + verifyBarOnlyAdded(topListener,allListener,fooListener,barListener); + } + + @Test + public void putTopBarNodeSubtreeListeners() { + TestListener topListener = createListener(CONFIGURATION, TOP, DataChangeScope.SUBTREE); + TestListener allListener = createListener(CONFIGURATION, WILDCARDED, DataChangeScope.SUBTREE); + TestListener fooListener = createListener(CONFIGURATION, TOP_FOO, DataChangeScope.SUBTREE); + TestListener barListener = createListener(CONFIGURATION, TOP_BAR, DataChangeScope.SUBTREE); + + ReadWriteTransaction writeTx = getDataBroker().newReadWriteTransaction(); + writeTx.put(CONFIGURATION, TOP_BAR, topLevelList(TOP_BAR_KEY)); + assertCommit(writeTx.commit()); + + verifyBarOnlyAdded(topListener,allListener,fooListener,barListener); + } + + @Test + public void mergeTopBarNodeSubtreeListeners() { + TestListener topListener = createListener(CONFIGURATION, TOP, DataChangeScope.SUBTREE); + TestListener allListener = createListener(CONFIGURATION, WILDCARDED, DataChangeScope.SUBTREE); + TestListener fooListener = createListener(CONFIGURATION, TOP_FOO, DataChangeScope.SUBTREE); + TestListener barListener = createListener(CONFIGURATION, TOP_BAR, DataChangeScope.SUBTREE); + + ReadWriteTransaction writeTx = getDataBroker().newReadWriteTransaction(); + writeTx.merge(CONFIGURATION, TOP_BAR, topLevelList(TOP_BAR_KEY)); + assertCommit(writeTx.commit()); + + verifyBarOnlyAdded(topListener,allListener,fooListener,barListener); + } + + private void verifyBarOnlyAdded(final TestListener top, final TestListener all, final TestListener foo, + final TestListener bar) { + + assertFalse(foo.hasEvent()); + + // Listener for TOP element + assertContains(top.event().getOriginalData(), TOP); + assertNotContains(top.event().getOriginalData(),TOP_FOO); + assertContains(top.event().getCreatedData(), TOP_BAR); + assertContains(top.event().getUpdatedData(), TOP); + assertEmpty(top.event().getRemovedPaths()); + + /* + * Listener for all list items + * + * Updated should be empty, since no list item was + * updated, items were only removed and added + */ + assertEmpty(all.event().getOriginalData()); + assertContains(all.event().getCreatedData(), TOP_BAR); + assertEmpty(all.event().getUpdatedData()); + assertEmpty(all.event().getRemovedPaths()); + + /* + * Listener for all Foo item + * + * Foo Listener should not have foo event + */ + assertFalse(foo.hasEvent()); + + /* + * Listener for bar list items + * + * Updated should be empty, since no list item was + * updated, items were only removed and added + */ + assertEmpty(bar.event().getOriginalData()); + assertContains(bar.event().getCreatedData(), TOP_BAR); + assertEmpty(bar.event().getUpdatedData()); + assertEmpty(bar.event().getRemovedPaths()); + } + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/WriteTransactionTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/WriteTransactionTest.java new file mode 100644 index 0000000000..43e951423c --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/test/WriteTransactionTest.java @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.impl.test; + +import static org.junit.Assert.assertEquals; + +import java.util.concurrent.ExecutionException; + +import org.junit.Test; +import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest; +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.TopBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + + +public class WriteTransactionTest extends AbstractDataBrokerTest { + + private static final InstanceIdentifier TOP_PATH = InstanceIdentifier.create(Top.class); + private static final TopLevelListKey TOP_LIST_KEY = new TopLevelListKey("foo"); + private static final InstanceIdentifier NODE_PATH = TOP_PATH.child(TopLevelList.class, TOP_LIST_KEY); + + @Test + public void test() throws InterruptedException, ExecutionException { + WriteTransaction writeTx = getDataBroker().newWriteOnlyTransaction(); + writeTx.put(LogicalDatastoreType.OPERATIONAL, TOP_PATH, new TopBuilder().build()); + writeTx.put(LogicalDatastoreType.OPERATIONAL, NODE_PATH, new TopLevelListBuilder().setKey(TOP_LIST_KEY).build()); + assertEquals(TransactionStatus.COMMITED, writeTx.commit().get().getResult()); + } + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTest.java new file mode 100644 index 0000000000..7f23ac26b6 --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.test; + +import static org.junit.Assert.assertEquals; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; +import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; + +import com.google.common.util.concurrent.ListenableFuture; + +public class AbstractDataBrokerTest extends AbstractSchemaAwareTest { + + private DataBrokerTestCustomizer testCustomizer; + private DataBroker dataBroker; + private DOMDataBroker domBroker; + + + @Override + protected void setupWithSchema(final SchemaContext context) { + testCustomizer = createDataBrokerTestCustomizer(); + dataBroker = testCustomizer.createDataBroker(); + domBroker = testCustomizer.createDOMDataBroker(); + testCustomizer.updateSchema(context); + setupWithDataBroker(dataBroker); + } + + protected void setupWithDataBroker(final DataBroker dataBroker) { + // Intentionally left No-op, subclasses may customize it + } + + protected DataBrokerTestCustomizer createDataBrokerTestCustomizer() { + return new DataBrokerTestCustomizer(); + } + + public DataBroker getDataBroker() { + return dataBroker; + } + + public DOMDataBroker getDomBroker() { + return domBroker; + } + + protected static final void assertCommit(final ListenableFuture> commit) { + try { + assertEquals(TransactionStatus.COMMITED,commit.get(500, TimeUnit.MILLISECONDS).getResult()); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + throw new IllegalStateException(e); + } + } + + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataChangeListenerTest.java new file mode 100644 index 0000000000..7742f372cf --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataChangeListenerTest.java @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.test; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + +import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +import com.google.common.util.concurrent.SettableFuture; + +public abstract class AbstractDataChangeListenerTest extends AbstractDataBrokerTest { + + protected static final class TestListener implements DataChangeListener { + + private final SettableFuture, DataObject>> event; + private boolean capture = false; + + private TestListener() { + event = SettableFuture.create(); + } + + @Override + public void onDataChanged(final AsyncDataChangeEvent, DataObject> arg) { + if (capture) { + event.set(arg); + } + } + + public AsyncDataChangeEvent, DataObject> event() { + try { + return event.get(500, TimeUnit.MILLISECONDS); + } catch (InterruptedException | TimeoutException | ExecutionException e) { + throw new IllegalStateException(e); + } + } + + public boolean hasEvent() { + return event.isDone(); + } + + public void startCapture() { + this.capture = true; + } + } + + protected final TestListener createListener(final LogicalDatastoreType store, final InstanceIdentifier path, + final DataChangeScope scope) { + TestListener listener = new TestListener(); + getDataBroker().registerDataChangeListener(store, path, listener, scope); + listener.startCapture(); + return listener; + } +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractSchemaAwareTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractSchemaAwareTest.java new file mode 100644 index 0000000000..78febb50f7 --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractSchemaAwareTest.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.test; + +import org.junit.Before; +import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.yang.binding.util.BindingReflections; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; + +public abstract class AbstractSchemaAwareTest { + + private Iterable moduleInfos; + private SchemaContext schemaContext; + + + protected Iterable getModuleInfos() { + return BindingReflections.loadModuleInfos(); + } + + + @Before + public final void setup() { + moduleInfos = getModuleInfos(); + ModuleInfoBackedContext moduleContext = ModuleInfoBackedContext.create(); + moduleContext.addModuleInfos(moduleInfos); + schemaContext = moduleContext.tryToCreateSchemaContext().get(); + setupWithSchema(schemaContext); + } + + /** + * Setups test with Schema context. + * This method is called before {@link #setupWithSchemaService(SchemaService)} + * + * @param context + */ + protected abstract void setupWithSchema(SchemaContext context); + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AssertCollections.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AssertCollections.java new file mode 100644 index 0000000000..25b91bc3e4 --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AssertCollections.java @@ -0,0 +1,42 @@ +package org.opendaylight.controller.md.sal.binding.test; + +import java.util.Collection; +import java.util.Map; + +import org.junit.Assert; + +public class AssertCollections { + + public static void assertEmpty(final Collection set) { + Assert.assertTrue(set.isEmpty()); + } + + public static void assertEmpty(final Map set) { + Assert.assertTrue(set.isEmpty()); + } + + public static void assertContains(final Collection set, final Object... values) { + for (Object key : values) { + Assert.assertTrue(set.contains(key)); + } + + } + + public static void assertNotContains(final Collection set, final Object... values) { + for (Object key : values) { + Assert.assertFalse(set.contains(key)); + } + } + + public static void assertContains(final Map map, final Object... values) { + for (Object key : values) { + Assert.assertTrue(map.containsKey(key)); + } + } + + public static void assertNotContains(final Map map, final Object... values) { + for (Object key : values) { + Assert.assertFalse(map.containsKey(key)); + } + } +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java new file mode 100644 index 0000000000..79aa6b634b --- /dev/null +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/DataBrokerTestCustomizer.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.binding.test; + +import javassist.ClassPool; + +import org.opendaylight.controller.md.sal.binding.api.DataBroker; +import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; +import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl; +import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; +import org.opendaylight.controller.sal.binding.test.util.MockSchemaService; +import org.opendaylight.controller.sal.core.api.model.SchemaService; +import org.opendaylight.controller.sal.core.spi.data.DOMStore; +import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; +import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; + +import com.google.common.collect.ImmutableMap; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; + +public class DataBrokerTestCustomizer { + + private DOMDataBroker domDataBroker; + private final RuntimeGeneratedMappingServiceImpl mappingService; + private final MockSchemaService schemaService; + private ImmutableMap datastores; + + public ImmutableMap createDatastores() { + return ImmutableMap.builder() + .put(LogicalDatastoreType.OPERATIONAL, createOperationalDatastore()) + .put(LogicalDatastoreType.CONFIGURATION,createConfigurationDatastore()) + .build(); + } + + public DataBrokerTestCustomizer() { + schemaService = new MockSchemaService(); + mappingService = new RuntimeGeneratedMappingServiceImpl(ClassPool.getDefault()); + } + + public DOMStore createConfigurationDatastore() { + InMemoryDOMDataStore store = new InMemoryDOMDataStore("CFG", MoreExecutors.sameThreadExecutor()); + schemaService.registerSchemaServiceListener(store); + return store; + } + + public DOMStore createOperationalDatastore() { + InMemoryDOMDataStore store = new InMemoryDOMDataStore("OPER", MoreExecutors.sameThreadExecutor()); + schemaService.registerSchemaServiceListener(store); + return store; + } + + public DOMDataBroker createDOMDataBroker() { + return new DOMDataBrokerImpl(getDatastores(), getCommitCoordinatorExecutor()); + } + + public ListeningExecutorService getCommitCoordinatorExecutor() { + return MoreExecutors.sameThreadExecutor(); + } + + public DataBroker createDataBroker() { + return new ForwardedBindingDataBroker(getDOMDataBroker(), getMappingService(), getSchemaService()); + } + + private SchemaService getSchemaService() { + return schemaService; + } + + private BindingIndependentMappingService getMappingService() { + return mappingService; + } + + private DOMDataBroker getDOMDataBroker() { + if(domDataBroker == null) { + domDataBroker = createDOMDataBroker(); + } + return domDataBroker; + } + + private ImmutableMap getDatastores() { + if(datastores == null) { + datastores = createDatastores(); + } + return datastores; + } + + public void updateSchema(final SchemaContext ctx) { + schemaService.changeSchema(ctx); + mappingService.onGlobalContextUpdated(ctx); + } + +} diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java index 6c80f4d739..591e07d004 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/AbstractDataServiceTest.java @@ -7,28 +7,21 @@ */ package org.opendaylight.controller.sal.binding.test; -import org.junit.After; import org.junit.Before; import org.opendaylight.controller.sal.binding.api.data.DataProviderService; import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; -import org.opendaylight.controller.sal.core.api.data.DataStore; -import org.opendaylight.controller.sal.dom.broker.impl.DataStoreStatsWrapper; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@SuppressWarnings("deprecation") public abstract class AbstractDataServiceTest { - private static Logger log = LoggerFactory.getLogger(AbstractDataServiceTest.class); protected org.opendaylight.controller.sal.core.api.data.DataProviderService biDataService; protected DataProviderService baDataService; protected BindingIndependentMappingService mappingService; - private DataStoreStatsWrapper dataStoreStats; - protected DataStore dataStore; protected BindingTestContext testContext; @Before @@ -42,18 +35,10 @@ public abstract class AbstractDataServiceTest { baDataService = testContext.getBindingDataBroker(); biDataService = testContext.getDomDataBroker(); - dataStore = testContext.getDomDataStore(); mappingService = testContext.getBindingToDomMappingService(); } protected boolean getStartWithSchema() { return true; } - - @After - public void afterTest() { - - testContext.logDataStoreStatistics(); - - } } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java index e6cd1aa1ad..9ba6533971 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/RuntimeCodeGeneratorTest.java @@ -10,6 +10,7 @@ package org.opendaylight.controller.sal.binding.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -154,6 +155,31 @@ public class RuntimeCodeGeneratorTest { // We should have call to instance 1 verify(service[1]).simple(instance_1_input[0]); + + /* + * Generated RPC service should throw illegalArgumentException + * with message if rpc input is null. + */ + try { + product.getInvocationProxy().simple(null); + fail("Generated RPC router should throw IllegalArgumentException on null input"); + } catch (IllegalArgumentException e){ + assertNotNull(e.getMessage()); + } + + + /* + * Generated RPC service should throw illegalArgumentException + * with message if rpc route is null. + */ + try { + SimpleInput withoutValue = new SimpleInputImpl(null); + product.getInvocationProxy().simple(withoutValue); + fail("Generated RPC router should throw IllegalArgumentException on null value for route"); + } catch (IllegalArgumentException e){ + assertNotNull(e.getMessage()); + } + } private InstanceIdentifier[][] identifiers(final int serviceSize, final int instancesPerService) { diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/MultipleAugmentationPutsTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/MultipleAugmentationPutsTest.java similarity index 99% rename from opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/MultipleAugmentationPutsTest.java rename to opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/MultipleAugmentationPutsTest.java index 25c57ccd5f..6cefd13398 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/MultipleAugmentationPutsTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/MultipleAugmentationPutsTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.test.bugfix; +package org.opendaylight.controller.sal.binding.test.compat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/UnionSerializationTest.java similarity index 97% rename from opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java rename to opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/UnionSerializationTest.java index 9f8a443bbf..54c6cc27ec 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/UnionSerializationTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/UnionSerializationTest.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.test.bugfix; +package org.opendaylight.controller.sal.binding.test.compat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/CompositeNodeUtils.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/package-info.java similarity index 72% rename from opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/CompositeNodeUtils.java rename to opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/package-info.java index 1a8d17992f..ec74c3e19b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/sal/binding/impl/connect/dom/CompositeNodeUtils.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/compat/package-info.java @@ -5,8 +5,9 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.impl.connect.dom; - -public class CompositeNodeUtils { - -} +/** + * + * Test suite targeting legacy Data APIs + * + */ +package org.opendaylight.controller.sal.binding.test.compat; \ No newline at end of file diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java index 08c5d061dc..c58e258e8b 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java @@ -11,10 +11,12 @@ import java.util.concurrent.ExecutorService; import javassist.ClassPool; +import com.google.common.annotations.Beta; import com.google.common.base.Preconditions; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@Beta public class BindingBrokerTestFactory { private static final ClassPool CLASS_POOL = ClassPool.getDefault(); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 1ea56381ef..f5e902c775 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -9,15 +9,14 @@ package org.opendaylight.controller.sal.binding.test.util; import static com.google.common.base.Preconditions.checkState; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; import java.util.Set; import java.util.concurrent.Future; import javassist.ClassPool; +import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.impl.ForwardedBackwardsCompatibleDataBroker; +import org.opendaylight.controller.md.sal.binding.impl.ForwardedBindingDataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker; import org.opendaylight.controller.md.sal.dom.broker.impl.DOMDataBrokerImpl; @@ -39,36 +38,33 @@ import org.opendaylight.controller.sal.core.api.BrokerService; import org.opendaylight.controller.sal.core.api.RpcImplementation; import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry; import org.opendaylight.controller.sal.core.api.RpcRegistrationListener; -import org.opendaylight.controller.sal.core.api.data.DataStore; import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; import org.opendaylight.controller.sal.core.spi.data.DOMStore; import org.opendaylight.controller.sal.dom.broker.BrokerImpl; import org.opendaylight.controller.sal.dom.broker.MountPointManagerImpl; -import org.opendaylight.controller.sal.dom.broker.impl.DataStoreStatsWrapper; -import org.opendaylight.controller.sal.dom.broker.impl.HashMapDataStore; -import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareDataStoreAdapter; import org.opendaylight.controller.sal.dom.broker.impl.SchemaAwareRpcBroker; import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl; +import org.opendaylight.yangtools.yang.binding.YangModuleInfo; +import org.opendaylight.yangtools.yang.binding.util.BindingReflections; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.CompositeNode; import org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; -import org.reflections.Reflections; -import org.reflections.scanners.ResourcesScanner; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Predicate; +import com.google.common.annotations.Beta; import com.google.common.collect.ClassToInstanceMap; import com.google.common.collect.ImmutableClassToInstanceMap; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.MutableClassToInstanceMap; import com.google.common.util.concurrent.ListeningExecutorService; +@Beta public class BindingTestContext implements AutoCloseable { public static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier TREE_ROOT = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier @@ -84,14 +80,9 @@ public class BindingTestContext implements AutoCloseable { private BindingIndependentConnector baConnectImpl; private org.opendaylight.controller.sal.dom.broker.DataBrokerImpl biDataImpl; + @SuppressWarnings("deprecation") private org.opendaylight.controller.sal.core.api.data.DataProviderService biDataLegacyBroker; private BrokerImpl biBrokerImpl; - private HashMapDataStore rawDataStore; - private SchemaAwareDataStoreAdapter schemaAwareDataStore; - private DataStoreStatsWrapper dataStoreStats; - private DataStore dataStore; - - private final boolean dataStoreStatisticsEnabled = false; private final ListeningExecutorService executor; private final ClassPool classPool; @@ -106,12 +97,15 @@ public class BindingTestContext implements AutoCloseable { private BackwardsCompatibleDataBroker biCompatibleBroker; + @SuppressWarnings("deprecation") private DataProviderService baData; private DOMDataBroker newDOMDataBroker; private final MockSchemaService mockSchemaService = new MockSchemaService(); + private DataBroker dataBroker; + public DOMDataBroker getDomAsyncDataBroker() { @@ -124,25 +118,6 @@ public class BindingTestContext implements AutoCloseable { this.startWithSchema = startWithSchema; } - @Deprecated - public void startDomDataStore() { - checkState(dataStore == null, "DataStore already started."); - checkState(biDataImpl != null, "Dom Data Broker not present"); - rawDataStore = new HashMapDataStore(); - schemaAwareDataStore = new SchemaAwareDataStoreAdapter(); - schemaAwareDataStore.changeDelegate(rawDataStore); - if (dataStoreStatisticsEnabled) { - dataStoreStats = new DataStoreStatsWrapper(schemaAwareDataStore); - dataStore = dataStoreStats; - } else { - dataStore = schemaAwareDataStore; - } - mockSchemaService.registerSchemaServiceListener(schemaAwareDataStore); - biDataImpl.registerConfigurationReader(TREE_ROOT, dataStore); - biDataImpl.registerOperationalReader(TREE_ROOT, dataStore); - biDataImpl.registerCommitHandler(TREE_ROOT, dataStore); - } - public void startDomDataBroker() { checkState(executor != null, "Executor needs to be set"); biDataImpl = new org.opendaylight.controller.sal.dom.broker.DataBrokerImpl(); @@ -150,6 +125,12 @@ public class BindingTestContext implements AutoCloseable { biDataLegacyBroker = biDataImpl; } + public void startNewDataBroker() { + checkState(executor != null, "Executor needs to be set"); + checkState(newDOMDataBroker != null, "DOM Data Broker must be set"); + dataBroker = new ForwardedBindingDataBroker(newDOMDataBroker, mappingServiceImpl, mockSchemaService); + } + public void startNewDomDataBroker() { checkState(executor != null, "Executor needs to be set"); InMemoryDOMDataStore operStore = new InMemoryDOMDataStore("OPER", executor); @@ -203,6 +184,7 @@ public class BindingTestContext implements AutoCloseable { private ProviderSession createMockContext() { + @SuppressWarnings("deprecation") final ClassToInstanceMap domBrokerServices = ImmutableClassToInstanceMap . builder() // @@ -267,56 +249,24 @@ public class BindingTestContext implements AutoCloseable { mockSchemaService.registerSchemaServiceListener(mappingServiceImpl); } - public void updateYangSchema(final String[] files) { - mockSchemaService.changeSchema(getContext(files)); + private void updateYangSchema(final ImmutableSet moduleInfos) { + mockSchemaService.changeSchema(getContext(moduleInfos)); } - public static String[] getAllYangFilesOnClasspath() { - Predicate predicate = new Predicate() { - @Override - public boolean apply(final String input) { - return input.endsWith(".yang"); - } - }; - Reflections reflection = new Reflections("META-INF.yang", new ResourcesScanner()); - Set result = reflection.getResources(predicate); - return result.toArray(new String[result.size()]); - } - - private static SchemaContext getContext(final String[] yangFiles) { - ClassLoader loader = BindingTestContext.class.getClassLoader(); - List streams = new ArrayList<>(); - for (String string : yangFiles) { - InputStream stream = loader.getResourceAsStream(string); - streams.add(stream); - } - YangParserImpl parser = new YangParserImpl(); - Set modules = parser.parseYangModelsFromStreams(streams); - return parser.resolveSchemaContext(modules); - } - - public void startLegacy() { - startBindingDataBroker(); - startBindingNotificationBroker(); - startBindingBroker(); - startDomDataBroker(); - startDomDataStore(); - startDomBroker(); - startDomMountPoint(); - startBindingToDomMappingService(); - startForwarding(); - if (startWithSchema) { - loadYangSchemaFromClasspath(); - } + private SchemaContext getContext(final ImmutableSet moduleInfos) { + ModuleInfoBackedContext ctx = ModuleInfoBackedContext.create(); + ctx.addModuleInfos(moduleInfos); + return ctx.tryToCreateSchemaContext().get(); } public void start() { startNewDomDataBroker(); + startDomBroker(); startDomMountPoint(); startBindingToDomMappingService(); + startNewDataBroker(); startNewBindingDataBroker(); - startBindingNotificationBroker(); startBindingBroker(); @@ -352,44 +302,24 @@ public class BindingTestContext implements AutoCloseable { } public void loadYangSchemaFromClasspath() { - String[] files = getAllYangFilesOnClasspath(); - updateYangSchema(files); + ImmutableSet moduleInfos = BindingReflections.loadModuleInfos(); + updateYangSchema(moduleInfos); } + @SuppressWarnings("deprecation") public DataProviderService getBindingDataBroker() { return baData; } + @SuppressWarnings("deprecation") public org.opendaylight.controller.sal.core.api.data.DataProviderService getDomDataBroker() { return biDataLegacyBroker; } - public DataStore getDomDataStore() { - return dataStore; - } - public BindingIndependentMappingService getBindingToDomMappingService() { return mappingServiceImpl; } - public void logDataStoreStatistics() { - if (dataStoreStats == null) { - return; - } - - LOG.info("BIDataStore Statistics: Configuration Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getConfigurationReadCount(), dataStoreStats.getConfigurationReadTotalTime(), - dataStoreStats.getConfigurationReadAverageTime()); - - LOG.info("BIDataStore Statistics: Operational Read Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getOperationalReadCount(), dataStoreStats.getOperationalReadTotalTime(), - dataStoreStats.getOperationalReadAverageTime()); - - LOG.info("BIDataStore Statistics: Request Commit Count: {} TotalTime: {} ms AverageTime (ns): {} ms", - dataStoreStats.getRequestCommitCount(), dataStoreStats.getRequestCommitTotalTime(), - dataStoreStats.getRequestCommitAverageTime()); - } - public RpcProviderRegistry getBindingRpcRegistry() { return baBrokerImpl.getRoot(); } @@ -418,5 +348,9 @@ public class BindingTestContext implements AutoCloseable { return biMountImpl; } + public DataBroker getDataBroker() { + return dataBroker; + } + } diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index fd5c5be18d..42d5cfff65 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -44,12 +44,21 @@ pax-exam-container-native test - org.slf4j slf4j-simple test + + org.opendaylight.yangtools + yang-parser-impl + test + + + org.opendaylight.controller + sal-test-model + 1.1-SNAPSHOT + @@ -77,26 +86,6 @@ - - org.opendaylight.yangtools - yang-maven-plugin - - - - generate-sources - - - - - org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl - ${salGeneratorPath} - - - true - - - - diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java index c5dbdcecae..aefc53b124 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ConcurrentImplicitCreateTest.java @@ -25,6 +25,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.N import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +/* + * FIXME: THis test should be moved to sal-binding-broker and rewriten + * to use new DataBroker API + */ +@SuppressWarnings("deprecation") public class ConcurrentImplicitCreateTest extends AbstractDataServiceTest { private static final NodeKey NODE_FOO_KEY = new NodeKey(new NodeId("foo")); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java index 667887ac80..cd68559ae5 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/ListProcessingAndOrderingTest.java @@ -50,12 +50,10 @@ import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ListenableFuture; /* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * FIXME: THis test should be moved to sal-binding-broker and rewriten + * to use new DataBroker API */ +@SuppressWarnings("deprecation") public class ListProcessingAndOrderingTest extends AbstractDataServiceTest { private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier DOM_UNORDERED_LIST_PATH = org.opendaylight.yangtools.yang.data.api.InstanceIdentifier @@ -171,7 +169,6 @@ public class ListProcessingAndOrderingTest extends AbstractDataServiceTest { assertEquals(TransactionStatus.COMMITED,result.getResult()); } - @SuppressWarnings("deprecation") private void assertXmlRepresentation(final InstanceIdentifier containerPath, final String... childNameValues) { org.opendaylight.yangtools.yang.data.api.InstanceIdentifier domPath = testContext.getBindingToDomMappingService().toDataDom(containerPath); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java index 6b4cc57798..2b5171369b 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java @@ -43,12 +43,10 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import com.google.common.util.concurrent.SettableFuture; /* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html + * FIXME: THis test should be moved to compat test-suite and rewriten + * to use sal-test-model */ +@SuppressWarnings("deprecation") public class WildcardedDataChangeListenerTest extends AbstractDataServiceTest { private static final NodeKey NODE_0_KEY = new NodeKey(new NodeId("test:0")); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java index 4719352485..0c767f6185 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug01Test.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -49,49 +48,29 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.vlan.match.fields.VlanIdBuilder; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.data.api.CompositeNode; -import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@SuppressWarnings("deprecation") public class DOMCodecBug01Test extends AbstractDataServiceTest { - private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); - private static final QName FLOW_ID_QNAME = QName.create(Flow.QNAME, "id"); - private static final QName FLOW_NODE_QNAME = QName.create(Flow.QNAME, "node"); private static final long FLOW_ID = 1234; private static final String NODE_ID = "node:1"; private static final NodeKey NODE_KEY = new NodeKey(new NodeId(NODE_ID)); - private static final Map NODE_KEY_BI = Collections. singletonMap(NODE_ID_QNAME, - NODE_ID); - private static final InstanceIdentifier NODE_INSTANCE_ID_BA = InstanceIdentifier.builder(Nodes.class) // .child(Node.class, NODE_KEY).toInstance(); - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODE_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .nodeWithKey(Node.QNAME, NODE_KEY_BI) // - .toInstance(); private static final NodeRef NODE_REF = new NodeRef(NODE_INSTANCE_ID_BA); private static final FlowKey FLOW_KEY = new FlowKey(FLOW_ID, NODE_REF); - private static final Map FLOW_KEY_BI = // - ImmutableMap. of(FLOW_ID_QNAME, FLOW_ID, FLOW_NODE_QNAME, NODE_INSTANCE_ID_BI); - - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier FLOW_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Flows.QNAME) // - .nodeWithKey(Flow.QNAME, FLOW_KEY_BI) // - .toInstance(); private static final InstanceIdentifier FLOW_INSTANCE_ID_BA = // InstanceIdentifier.builder(Flows.class) // .child(Flow.class, FLOW_KEY) // diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java index bc6f567c2b..bddbc4e954 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug02Test.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import java.util.Collections; -import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -22,47 +21,21 @@ import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodesBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.RpcResult; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; +@SuppressWarnings("deprecation") public class DOMCodecBug02Test extends AbstractDataServiceTest { - private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); - private static final String NODE_ID = "node:1"; - - private static final NodeKey NODE_KEY = new NodeKey(new NodeId(NODE_ID)); - - private static final Map NODE_KEY_BI = Collections. singletonMap(NODE_ID_QNAME, - NODE_ID); - private static final InstanceIdentifier NODES_INSTANCE_ID_BA = InstanceIdentifier.builder(Nodes.class) // .toInstance(); - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODES_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .toInstance(); - - private static final InstanceIdentifier NODE_INSTANCE_ID_BA = InstanceIdentifier.builder(Nodes.class) // - .child(Node.class, NODE_KEY).toInstance(); - - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODE_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .nodeWithKey(Node.QNAME, NODE_KEY_BI) // - .toInstance(); - private static final NodeRef NODE_REF = new NodeRef(NODE_INSTANCE_ID_BA); - /** * This test is ignored, till found out better way to test generation of * classes without leaking of instances from previous run @@ -81,7 +54,6 @@ public class DOMCodecBug02Test extends AbstractDataServiceTest { baDataService = testContext.getBindingDataBroker(); biDataService = testContext.getDomDataBroker(); - dataStore = testContext.getDomDataStore(); mappingService = testContext.getBindingToDomMappingService(); }; diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java index ccbd52fc77..dd8eaa7d5f 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DOMCodecBug03Test.java @@ -46,6 +46,7 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; import com.google.common.util.concurrent.SettableFuture; +@SuppressWarnings("deprecation") public class DOMCodecBug03Test extends AbstractDataServiceTest implements DataChangeListener { private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DeleteNestedAugmentationListenParentTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DeleteNestedAugmentationListenParentTest.java index c1eba3ee25..fb5fd1fa6c 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DeleteNestedAugmentationListenParentTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/DeleteNestedAugmentationListenParentTest.java @@ -24,12 +24,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; -import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import com.google.common.util.concurrent.SettableFuture; +@SuppressWarnings("deprecation") public class DeleteNestedAugmentationListenParentTest extends AbstractDataServiceTest { private static final NodeKey NODE_KEY = new NodeKey(new NodeId("foo")); @@ -38,11 +38,6 @@ public class DeleteNestedAugmentationListenParentTest extends AbstractDataServic private static final FlowKey FLOW_KEY = new FlowKey(new FlowId("100")); - private static final InstanceIdentifier LISTENER_PATH = InstanceIdentifier.builder(Nodes.class) // - .child(Node.class) - .augmentation(FlowCapableNode.class).build(); - - private static final InstanceIdentifier NODE_AUGMENT_PATH = InstanceIdentifier.builder(Nodes.class) .child(Node.class,NODE_KEY) .augmentation(FlowCapableNode.class) @@ -63,7 +58,7 @@ public class DeleteNestedAugmentationListenParentTest extends AbstractDataServic final SettableFuture, DataObject>> event = SettableFuture.create(); - ListenerRegistration listenerReg = baDataService.registerDataChangeListener(FLOW_PATH, new DataChangeListener() { + baDataService.registerDataChangeListener(FLOW_PATH, new DataChangeListener() { @Override public void onDataChanged(final DataChangeEvent, DataObject> change) { diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/FlagsSerializationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/FlagsSerializationTest.java index 30c7af705f..7143352c1f 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/FlagsSerializationTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/FlagsSerializationTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertNull; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; import org.junit.Test; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; @@ -39,7 +38,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; @@ -54,11 +52,9 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; import com.google.common.collect.ImmutableSet; +@SuppressWarnings("deprecation") public class FlagsSerializationTest extends AbstractDataServiceTest { - private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); - private static final QName FLOW_ID_QNAME = QName.create(Flow.QNAME, "id"); - private static final QName FLOW_NODE_QNAME = QName.create(Flow.QNAME, "node"); private static final String FLOW_ID = "1234"; private static final short TABLE_ID = (short)0; private static final String NODE_ID = "node:1"; @@ -67,27 +63,9 @@ public class FlagsSerializationTest extends AbstractDataServiceTest { private static final FlowKey FLOW_KEY = new FlowKey(new FlowId(FLOW_ID)); private static final TableKey TABLE_KEY = new TableKey(TABLE_ID); - private static final Map NODE_KEY_BI = Collections. singletonMap(NODE_ID_QNAME, - NODE_ID); - private static final InstanceIdentifier NODE_INSTANCE_ID_BA = InstanceIdentifier.builder(Nodes.class) // .child(Node.class, NODE_KEY).toInstance(); - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODE_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .nodeWithKey(Node.QNAME, NODE_KEY_BI) // - .toInstance(); - private static final NodeRef NODE_REF = new NodeRef(NODE_INSTANCE_ID_BA); - - - -// private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier FLOW_INSTANCE_ID_BI = // -// org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // -// -// .node(Flows.QNAME) // -// .nodeWithKey(Flow.QNAME, FLOW_KEY_BI) // -// .toInstance(); private static final InstanceIdentifier FLOW_INSTANCE_ID_BA = // NODE_INSTANCE_ID_BA.builder() // .augmentation(FlowCapableNode.class) @@ -113,15 +91,13 @@ public class FlagsSerializationTest extends AbstractDataServiceTest { ImmutableSet domAllTrueFlags = ImmutableSet.of("CHECK_OVERLAP","NO_BYT_COUNTS", "NO_PKT_COUNTS", "RESET_COUNTS", "SEND_FLOW_REM"); testFlags(allTrueFlags,domAllTrueFlags); - FlowModFlags nullFlags = null; - ImmutableSet domNullFlags = null; testFlags(null,null); } - private void testFlags(FlowModFlags flagsToTest, ImmutableSet domFlags) throws Exception { + private void testFlags(final FlowModFlags flagsToTest, final ImmutableSet domFlags) throws Exception { Flow flow = createFlow(flagsToTest); assertNotNull(flow); @@ -145,7 +121,7 @@ public class FlagsSerializationTest extends AbstractDataServiceTest { } - private Flow createFlow(FlowModFlags flagsToTest) throws Exception { + private Flow createFlow(final FlowModFlags flagsToTest) throws Exception { DataModificationTransaction modification = baDataService.beginTransaction(); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java index 7f16320814..33a4399cb5 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/PutAugmentationTest.java @@ -27,7 +27,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.Fl import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.flow.node.SupportedActions; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; @@ -45,6 +44,7 @@ import org.opendaylight.yangtools.yang.data.api.CompositeNode; import com.google.common.util.concurrent.SettableFuture; +@SuppressWarnings("deprecation") public class PutAugmentationTest extends AbstractDataServiceTest implements DataChangeListener { private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); @@ -62,12 +62,6 @@ public class PutAugmentationTest extends AbstractDataServiceTest implements Data NODES_INSTANCE_ID_BA.builder() // .child(Node.class, NODE_KEY).toInstance(); - private static final InstanceIdentifier SUPPORTED_ACTIONS_INSTANCE_ID_BA = // - NODES_INSTANCE_ID_BA.builder() // - .child(Node.class, NODE_KEY) // - .augmentation(FlowCapableNode.class) // - .child(SupportedActions.class).toInstance(); - private static final InstanceIdentifier ALL_FLOW_CAPABLE_NODES = // NODES_INSTANCE_ID_BA.builder() // .child(Node.class) // @@ -79,15 +73,6 @@ public class PutAugmentationTest extends AbstractDataServiceTest implements Data .node(Nodes.QNAME) // .nodeWithKey(Node.QNAME, NODE_KEY_BI) // .toInstance(); - private static final QName SUPPORTED_ACTIONS_QNAME = QName.create(FlowCapableNode.QNAME, - SupportedActions.QNAME.getLocalName()); - - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier SUPPORTED_ACTIONS_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .nodeWithKey(Node.QNAME, NODE_KEY_BI) // - .node(SUPPORTED_ACTIONS_QNAME) // - .toInstance(); private static final InstanceIdentifier FLOW_AUGMENTATION_PATH = NODE_INSTANCE_ID_BA.builder() // .augmentation(FlowCapableNode.class) // @@ -231,31 +216,11 @@ public class PutAugmentationTest extends AbstractDataServiceTest implements Data assertNull(node); } - private void verifyNodes(final Nodes nodes, final Node original) { - assertNotNull(nodes); - assertNotNull(nodes.getNode()); - assertEquals(1, nodes.getNode().size()); - Node readedNode = nodes.getNode().get(0); - assertEquals(original.getId(), readedNode.getId()); - assertEquals(original.getKey(), readedNode.getKey()); - - FlowCapableNode fnu = original.getAugmentation(FlowCapableNode.class); - FlowCapableNode readedAugment = readedNode.getAugmentation(FlowCapableNode.class); - assertNotNull(fnu); - assertEquals(fnu.getDescription(), readedAugment.getDescription()); - assertEquals(fnu.getSerialNumber(), readedAugment.getSerialNumber()); - - } - private void assertBindingIndependentVersion(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier nodeId) { CompositeNode node = biDataService.readOperationalData(nodeId); assertNotNull(node); } - private Nodes checkForNodes() { - return (Nodes) baDataService.readOperationalData(NODES_INSTANCE_ID_BA); - } - @Override public void onDataChanged(final DataChangeEvent, DataObject> change) { lastReceivedChangeEvent.set(change); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentListenAugmentTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentListenAugmentTest.java index cb31885f02..b09ba39a65 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentListenAugmentTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentListenAugmentTest.java @@ -31,6 +31,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import com.google.common.util.concurrent.SettableFuture; +@SuppressWarnings("deprecation") public class WriteParentListenAugmentTest extends AbstractDataServiceTest { private static final String NODE_ID = "node:1"; diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentReadChildTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentReadChildTest.java index f7b81a44e9..ad02d9a6f6 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentReadChildTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/WriteParentReadChildTest.java @@ -40,6 +40,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import com.google.common.collect.ImmutableList; +@SuppressWarnings("deprecation") public class WriteParentReadChildTest extends AbstractDataServiceTest { private static final String FLOW_ID = "1234"; diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/package-info.java similarity index 50% rename from opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java rename to opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/package-info.java index b54461c7c1..84559d506b 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/RpcRegistrationNullPointer.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/bugfix/package-info.java @@ -5,11 +5,11 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.controller.sal.binding.test.bugfix; - -public class RpcRegistrationNullPointer { - - - - -} +/** + * This testsuite test Hydrogen-level API and regression for most of it, + * + * FIXME: this testsuite needs to be refactored to use new DataBroker API, + * moved to sal-binding-broker-impl and uses models only from sal-test-model. + * + */ +package org.opendaylight.controller.sal.binding.test.bugfix; \ No newline at end of file diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java index 6d0226849f..481a7ddfa2 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/BrokerIntegrationTest.java @@ -11,16 +11,12 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; - import java.util.concurrent.Future; - import org.junit.Test; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction; - import org.opendaylight.controller.sal.binding.test.AbstractDataServiceTest; - import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; @@ -31,6 +27,8 @@ import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.RpcResult; +// FIXME: Migrate to use new Data Broker APIs +@SuppressWarnings("deprecation") public class BrokerIntegrationTest extends AbstractDataServiceTest { @Test @@ -105,14 +103,14 @@ public class BrokerIntegrationTest extends AbstractDataServiceTest { assertNull(readedData2); } - private static NodeRef createNodeRef(String string) { + private static NodeRef createNodeRef(final String string) { NodeKey key = new NodeKey(new NodeId(string)); InstanceIdentifier path = InstanceIdentifier.builder(Nodes.class).child(Node.class, key) .toInstance(); return new NodeRef(path); } - private static Node createNode(String string) { + private static Node createNode(final String string) { NodeBuilder ret = new NodeBuilder(); ret.setId(new NodeId(string)); ret.setKey(new NodeKey(ret.getId())); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java index 422b9ccee5..ae54896c6d 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/ChangeOriginatedInDomBrokerTest.java @@ -45,7 +45,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.Instruction; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.list.InstructionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; @@ -63,13 +62,14 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.SettableFuture; +// FIXME: Migrate to use new Data Broker APIs +@SuppressWarnings("deprecation") public class ChangeOriginatedInDomBrokerTest extends AbstractDataServiceTest { private static final Logger LOG = LoggerFactory.getLogger(ChangeOriginatedInDomBrokerTest.class); private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); private static final QName FLOW_ID_QNAME = QName.create(Flow.QNAME, "id"); - private static final QName FLOW_NODE_QNAME = QName.create(Flow.QNAME, "node"); private static final QName TABLE_ID_QNAME = QName.create(Table.QNAME, "id"); private static final String NODE_ID = "node:1"; @@ -87,13 +87,6 @@ public class ChangeOriginatedInDomBrokerTest extends AbstractDataServiceTest { private static final InstanceIdentifier NODE_INSTANCE_ID_BA = InstanceIdentifier.builder(Nodes.class) // .child(Node.class, NODE_KEY).toInstance(); - private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier NODE_INSTANCE_ID_BI = // - org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.builder() // - .node(Nodes.QNAME) // - .nodeWithKey(Node.QNAME, NODE_KEY_BI) // - .toInstance(); - private static final NodeRef NODE_REF = new NodeRef(NODE_INSTANCE_ID_BA); - private static final Map FLOW_KEY_BI = // ImmutableMap. of(FLOW_ID_QNAME, FLOW_ID.getValue()); diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java index 94570510ab..804fcc9fbe 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/CrossBrokerMountPointTest.java @@ -24,15 +24,12 @@ import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance; import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.table.Flow; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.NodeGroupStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.group.statistics.GroupStatistics; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupId; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.Group; import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.groups.GroupKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; @@ -43,13 +40,10 @@ import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode; import com.google.common.util.concurrent.MoreExecutors; +@SuppressWarnings("deprecation") public class CrossBrokerMountPointTest { private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); - private static final QName FLOW_ID_QNAME = QName.create(Flow.QNAME, "id"); - private static final QName FLOW_NODE_QNAME = QName.create(Flow.QNAME, "node"); - private static final QName TABLE_ID_QNAME = QName.create(Table.QNAME, "id"); - private static final String NODE_ID = "node:1"; private static final NodeKey NODE_KEY = new NodeKey(new NodeId(NODE_ID)); @@ -83,8 +77,6 @@ public class CrossBrokerMountPointTest { .nodeWithKey(QName.create(FlowCapableNode.QNAME, "group"), QName.create(FlowCapableNode.QNAME, "group-id"), 0L).node(AUGMENTED_GROUP_STATISTICS).toInstance(); - private static final NodeRef NODE_REF = new NodeRef(NODE_INSTANCE_ID_BA); - private BindingTestContext testContext; private MountProviderService bindingMountPointService; private MountProvisionService domMountPointService; @@ -123,13 +115,13 @@ public class CrossBrokerMountPointTest { DataReader simpleReader = new DataReader() { @Override - public CompositeNode readConfigurationData(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier arg0) { + public CompositeNode readConfigurationData(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier arg0) { return null; } @Override - public CompositeNode readOperationalData(org.opendaylight.yangtools.yang.data.api.InstanceIdentifier arg0) { + public CompositeNode readOperationalData(final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier arg0) { if (arg0.equals(GROUP_STATISTICS_ID_BI)) { ImmutableCompositeNode data = ImmutableCompositeNode .builder() diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java new file mode 100644 index 0000000000..c87b93625f --- /dev/null +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/sal/binding/test/connect/dom/DOMRpcServiceTestBugfix560.java @@ -0,0 +1,175 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.sal.binding.test.connect.dom; + +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; +import static junit.framework.Assert.fail; + +import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.Set; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.opendaylight.controller.sal.binding.api.mount.MountProviderInstance; +import org.opendaylight.controller.sal.binding.api.mount.MountProviderService; +import org.opendaylight.controller.sal.binding.test.util.BindingBrokerTestFactory; +import org.opendaylight.controller.sal.binding.test.util.BindingTestContext; +import org.opendaylight.controller.sal.common.util.Rpcs; +import org.opendaylight.controller.sal.core.api.RpcImplementation; +import org.opendaylight.controller.sal.core.api.mount.MountProvisionInstance; +import org.opendaylight.controller.sal.core.api.mount.MountProvisionService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node; +import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.OpendaylightTestRpcServiceService; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.RockTheHouseInputBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.util.BindingReflections; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; +import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; + +import com.google.common.collect.ImmutableSet; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; + +/** + * Test case for reported bug 560 + * + * @author Lukas Sedlak + * @see https://bugs.opendaylight.org/show_bug.cgi?id=560 + */ +public class DOMRpcServiceTestBugfix560 { + + private final static String RPC_SERVICE_NAMESPACE = "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:bi:ba:rpcservice"; + private final static String REVISION_DATE = "2014-07-01"; + private final static QName RPC_NAME = QName.create(RPC_SERVICE_NAMESPACE, + REVISION_DATE, "rock-the-house"); + + private static final NodeId MOUNT_NODE = new NodeId("id"); + private static final QName NODE_ID_QNAME = QName.create(Node.QNAME, "id"); + + private static final InstanceIdentifier BA_MOUNT_ID = createBANodeIdentifier(MOUNT_NODE); + private static final org.opendaylight.yangtools.yang.data.api.InstanceIdentifier BI_MOUNT_ID = createBINodeIdentifier(MOUNT_NODE); + + private BindingTestContext testContext; + private MountProvisionService domMountPointService; + private MountProviderService bindingMountPointService; + private SchemaContext schemaContext; + + /** + * @throws java.lang.Exception + */ + @Before + public void setUp() throws Exception { + BindingBrokerTestFactory testFactory = new BindingBrokerTestFactory(); + testFactory.setExecutor(MoreExecutors.sameThreadExecutor()); + testFactory.setStartWithParsedSchema(true); + testContext = testFactory.getTestContext(); + + testContext.start(); + domMountPointService = testContext.getDomMountProviderService(); + bindingMountPointService = testContext.getBindingMountProviderService(); + assertNotNull(domMountPointService); + + final YangContextParser parser = new YangParserImpl(); + final InputStream moduleStream = BindingReflections.getModuleInfo( + OpendaylightTestRpcServiceService.class) + .getModuleSourceStream(); + + assertNotNull(moduleStream); + List rpcModels = Collections.singletonList(moduleStream); + @SuppressWarnings("deprecation") + Set modules = parser.parseYangModelsFromStreams(rpcModels); + @SuppressWarnings("deprecation") + SchemaContext mountSchemaContext = parser.resolveSchemaContext(modules); + schemaContext = mountSchemaContext; + } + + private static org.opendaylight.yangtools.yang.data.api.InstanceIdentifier createBINodeIdentifier( + final NodeId mountNode) { + return org.opendaylight.yangtools.yang.data.api.InstanceIdentifier + .builder().node(Nodes.QNAME) + .nodeWithKey(Node.QNAME, NODE_ID_QNAME, mountNode.getValue()) + .toInstance(); + } + + private static InstanceIdentifier createBANodeIdentifier( + final NodeId mountNode) { + return InstanceIdentifier.builder(Nodes.class) + .child(Node.class, new NodeKey(mountNode)).toInstance(); + } + + @SuppressWarnings("deprecation") + @Test + public void test() throws ExecutionException, InterruptedException { + // FIXME: This is made to only make sure instance identifier codec + // for path is instantiated. + testContext.getBindingDataBroker().readOperationalData(BA_MOUNT_ID); + final MountProvisionInstance mountPoint = domMountPointService + .createMountPoint(BI_MOUNT_ID); + mountPoint.setSchemaContext(schemaContext); + assertNotNull(mountPoint); + + mountPoint.addRpcImplementation(RPC_NAME, new RpcImplementation() { + + @Override + public ListenableFuture> invokeRpc( + final QName rpc, final CompositeNode input) { + + return Futures.immediateFuture(Rpcs + . getRpcResult(true)); + } + + @Override + public Set getSupportedRpcs() { + return ImmutableSet.of(RPC_NAME); + } + }); + + final Set biSupportedRpcs = mountPoint.getSupportedRpcs(); + assertNotNull(biSupportedRpcs); + assertTrue(!biSupportedRpcs.isEmpty()); + + MountProviderInstance mountInstance = bindingMountPointService + .getMountPoint(BA_MOUNT_ID); + assertNotNull(mountInstance); + final OpendaylightTestRpcServiceService rpcService = mountInstance + .getRpcService(OpendaylightTestRpcServiceService.class); + assertNotNull(rpcService); + + try { + Future> result = rpcService + .rockTheHouse(new RockTheHouseInputBuilder().build()); + assertTrue(result.get().isSuccessful()); + } catch (IllegalStateException ex) { + fail("OpendaylightTestRpcServiceService class doesn't contain rockTheHouse method!"); + } + } + + /** + * @throws java.lang.Exception + */ + @After + public void teardown() throws Exception { + testContext.close(); + } +} diff --git a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java index 5ede600d97..c389618f2e 100644 --- a/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java +++ b/opendaylight/md-sal/sal-binding-it/src/main/java/org/opendaylight/controller/test/sal/binding/it/TestHelper.java @@ -54,6 +54,7 @@ public class TestHelper { mavenBundle("io.netty", "netty-transport").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // // + mavenBundle(CONTROLLER, "config-util").versionAsInProject(), // // mavenBundle("commons-io", "commons-io").versionAsInProject(), // mavenBundle(CONTROLLER, "config-manager").versionAsInProject(), // mavenBundle(CONTROLLER, "yang-jmx-generator").versionAsInProject(), // diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeEvent.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeEvent.java index 29c9bae31f..ac4a0ffc33 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeEvent.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeEvent.java @@ -101,7 +101,7 @@ public interface AsyncDataChangeEvent

    , D> extends Immutable { * * @return map of paths and original state of updated and removed objects. */ - Map getOriginalData(); + Map getOriginalData(); /** * Returns an immutable stable view of data state, which captures the state of diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeListener.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeListener.java index dca5200d39..0bdaf7bf37 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeListener.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/data/AsyncDataChangeListener.java @@ -41,9 +41,12 @@ public interface AsyncDataChangeListener

    , D> extends EventList * This initial event will contain all preexisting data as created. * *

    - * Note that this method may be invoked from a shared thread pool, so - * implementations SHOULD NOT perform CPU-intensive operations and they - * definitely MUST NOT invoke any potentially blocking operations. + * Note: This method may be invoked from a shared thread pool. + *

  • Implementations SHOULD NOT perform CPU-intensive operations on the calling thread. + *
  • Implementations MUST NOT block the calling thread - to do so could lead to deadlock + * scenarios. + * + *
    * * @param change * Data Change Event being delivered. diff --git a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java index f5f03a106b..bb866f276e 100644 --- a/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java +++ b/opendaylight/md-sal/sal-common-api/src/main/java/org/opendaylight/controller/md/sal/common/api/notify/NotificationPublishService.java @@ -9,9 +9,63 @@ package org.opendaylight.controller.md.sal.common.api.notify; import java.util.concurrent.ExecutorService; +/** + * Interface for publishing YANG-modeled notifications. + *

    + * Users of this interface can publish any YANG-modeled notification which will + * be delivered to all subscribed listeners. + *

    + * Prefered way of publishing of notifications is done by invoking {@link #publish(Object)}. + * + *

    You may consider using {@link #publish(Object, ExecutorService)} if and only if + * your use-case requires customized execution policy or run-to-completion + * inside process. + * + *

    + * The metadata required to deliver a notification to the correct listeners is + * extracted from the published notification. + * + * + * FIXME: Consider clarification of execution/delivery policy, how it will be + * affected by Actor model and cluster-wide notifications. + * + * @param + * the type of notifications + */ public interface NotificationPublishService { + /** + * Publishes a notification and notifies subscribed listeners. All listener + * notifications are done via a default executor. + *

    + * Note: This call will block when the default executor is saturated + * and the notification queue for this executor is full. + * + * @param notification + * the notification to publish. + */ void publish(N notification); - void publish(N notification,ExecutorService executor); + /** + * Publishes a notification and notifies subscribed listeners. All listener + * notifications are done via the provided executor. + *

    + * Note: Use only if ineccessary. Consider using + * {@link #publish(Object)} for most use-cases. + * + *

    + * By using this method you could customize execution policy of listeners present + * inside process (e.g. using single-threaded executor or even same-thread executor + * delivery. + * + *

    + * This executor is used only for inside-process notification deliveries. + * + * @param notification + * the notification to publish. + * @param executor + * the executor that will be used to deliver notifications to + * subscribed listeners. + */ + void publish(N notification, ExecutorService executor); } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java index 2b9694bed7..6176977104 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizationOperation.java @@ -10,11 +10,6 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import com.google.common.base.Optional; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableSet; - import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -52,19 +47,31 @@ import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaNode; + +import com.google.common.base.Optional; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; public abstract class DataNormalizationOperation implements Identifiable { private final T identifier; + private final Optional dataSchemaNode; @Override public T getIdentifier() { return identifier; }; - protected DataNormalizationOperation(final T identifier) { + protected DataNormalizationOperation(final T identifier, final SchemaNode schema) { super(); this.identifier = identifier; + if(schema instanceof DataSchemaNode) { + this.dataSchemaNode = Optional.of((DataSchemaNode) schema); + } else { + this.dataSchemaNode = Optional.absent(); + } } public boolean isMixin() { @@ -88,10 +95,15 @@ public abstract class DataNormalizationOperation impleme public abstract boolean isLeaf(); + public Optional getDataSchemaNode() { + // FIXME + return dataSchemaNode; + } + private static abstract class SimpleTypeNormalization extends DataNormalizationOperation { - protected SimpleTypeNormalization(final T identifier) { - super(identifier); + protected SimpleTypeNormalization(final T identifier, final DataSchemaNode potential) { + super(identifier,potential); } @Override @@ -127,8 +139,8 @@ public abstract class DataNormalizationOperation impleme private static final class LeafNormalization extends SimpleTypeNormalization { - protected LeafNormalization(final NodeIdentifier identifier) { - super(identifier); + protected LeafNormalization(final LeafSchemaNode potential) { + super(new NodeIdentifier(potential.getQName()),potential); } @Override @@ -141,7 +153,7 @@ public abstract class DataNormalizationOperation impleme private static final class LeafListEntryNormalization extends SimpleTypeNormalization { public LeafListEntryNormalization(final LeafListSchemaNode potential) { - super(new NodeWithValue(potential.getQName(), null)); + super(new NodeWithValue(potential.getQName(), null),potential); } @Override @@ -160,8 +172,8 @@ public abstract class DataNormalizationOperation impleme private static abstract class CompositeNodeNormalizationOperation extends DataNormalizationOperation { - protected CompositeNodeNormalizationOperation(final T identifier) { - super(identifier); + protected CompositeNodeNormalizationOperation(final T identifier, final DataSchemaNode schema) { + super(identifier,schema); } @SuppressWarnings({ "rawtypes", "unchecked" }) @@ -226,8 +238,8 @@ public abstract class DataNormalizationOperation impleme private final Map> byQName; private final Map> byArg; - protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema) { - super(identifier); + protected DataContainerNormalizationOperation(final T identifier, final DataNodeContainer schema, final DataSchemaNode node) { + super(identifier,node); this.schema = schema; this.byArg = new ConcurrentHashMap<>(); this.byQName = new ConcurrentHashMap<>(); @@ -283,7 +295,7 @@ public abstract class DataNormalizationOperation impleme private final List keyDefinition; protected ListItemNormalization(final NodeIdentifierWithPredicates identifier, final ListSchemaNode schema) { - super(identifier, schema); + super(identifier, schema,schema); keyDefinition = schema.getKeyDefinition(); } @@ -324,7 +336,7 @@ public abstract class DataNormalizationOperation impleme private static final class UnkeyedListItemNormalization extends DataContainerNormalizationOperation { protected UnkeyedListItemNormalization(final ListSchemaNode schema) { - super(new NodeIdentifier(schema.getQName()), schema); + super(new NodeIdentifier(schema.getQName()), schema,schema); } @Override @@ -342,7 +354,7 @@ public abstract class DataNormalizationOperation impleme private static final class ContainerNormalization extends DataContainerNormalizationOperation { protected ContainerNormalization(final ContainerSchemaNode schema) { - super(new NodeIdentifier(schema.getQName()), schema); + super(new NodeIdentifier(schema.getQName()),schema, schema); } @Override @@ -360,8 +372,8 @@ public abstract class DataNormalizationOperation impleme private static abstract class MixinNormalizationOp extends CompositeNodeNormalizationOperation { - protected MixinNormalizationOp(final T identifier) { - super(identifier); + protected MixinNormalizationOp(final T identifier, final DataSchemaNode schema) { + super(identifier,schema); } @Override @@ -395,7 +407,7 @@ public abstract class DataNormalizationOperation impleme private final DataNormalizationOperation innerOp; public UnorderedLeafListMixinNormalization(final LeafListSchemaNode potential) { - super(new NodeIdentifier(potential.getQName())); + super(new NodeIdentifier(potential.getQName()),potential); innerOp = new LeafListEntryNormalization(potential); } @@ -430,7 +442,7 @@ public abstract class DataNormalizationOperation impleme public AugmentationNormalization(final AugmentationSchema augmentation, final DataNodeContainer schema) { //super(); - super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema)); + super(augmentationIdentifierFrom(augmentation), augmentationProxy(augmentation,schema),null); } @Override @@ -479,7 +491,7 @@ public abstract class DataNormalizationOperation impleme private final ListItemNormalization innerNode; public UnorderedMapMixinNormalization(final ListSchemaNode list) { - super(new NodeIdentifier(list.getQName())); + super(new NodeIdentifier(list.getQName()),list); this.innerNode = new ListItemNormalization(new NodeIdentifierWithPredicates(list.getQName(), Collections. emptyMap()), list); } @@ -519,7 +531,7 @@ public abstract class DataNormalizationOperation impleme private final UnkeyedListItemNormalization innerNode; public UnkeyedListMixinNormalization(final ListSchemaNode list) { - super(new NodeIdentifier(list.getQName())); + super(new NodeIdentifier(list.getQName()),list); this.innerNode = new UnkeyedListItemNormalization(list); } @@ -577,7 +589,7 @@ public abstract class DataNormalizationOperation impleme private final ImmutableMap> byArg; protected ChoiceNodeNormalization(final org.opendaylight.yangtools.yang.model.api.ChoiceNode schema) { - super(new NodeIdentifier(schema.getQName())); + super(new NodeIdentifier(schema.getQName()),schema); ImmutableMap.Builder> byQNameBuilder = ImmutableMap.builder(); ImmutableMap.Builder> byArgBuilder = ImmutableMap.builder(); @@ -617,8 +629,8 @@ public abstract class DataNormalizationOperation impleme private static class AnyXmlNormalization extends DataNormalizationOperation { - protected AnyXmlNormalization( final NodeIdentifier identifier ) { - super( identifier ); + protected AnyXmlNormalization( final AnyXmlSchemaNode schema) { + super( new NodeIdentifier(schema.getQName()), schema); } @Override @@ -746,13 +758,13 @@ public abstract class DataNormalizationOperation impleme return fromListSchemaNode((ListSchemaNode) potential); } else if (potential instanceof LeafSchemaNode) { - return new LeafNormalization(new NodeIdentifier(potential.getQName())); + return new LeafNormalization((LeafSchemaNode) potential); } else if (potential instanceof org.opendaylight.yangtools.yang.model.api.ChoiceNode) { return new ChoiceNodeNormalization((org.opendaylight.yangtools.yang.model.api.ChoiceNode) potential); } else if (potential instanceof LeafListSchemaNode) { return fromLeafListSchemaNode((LeafListSchemaNode) potential); } else if (potential instanceof AnyXmlSchemaNode) { - return new AnyXmlNormalization( new NodeIdentifier(potential.getQName() ) ); + return new AnyXmlNormalization( (AnyXmlSchemaNode) potential); } return null; } diff --git a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java index 113d3dc9f7..e2a960a67a 100644 --- a/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java +++ b/opendaylight/md-sal/sal-common-impl/src/main/java/org/opendaylight/controller/md/sal/common/impl/util/compat/DataNormalizer.java @@ -9,12 +9,6 @@ package org.opendaylight.controller.md.sal.common.impl.util.compat; import static com.google.common.base.Preconditions.checkArgument; -import com.google.common.base.Preconditions; -import com.google.common.base.Predicates; -import com.google.common.collect.FluentIterable; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; - import java.util.AbstractMap; import java.util.ArrayList; import java.util.Iterator; @@ -38,6 +32,12 @@ import org.opendaylight.yangtools.yang.data.impl.SimpleNodeTOImpl; import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import com.google.common.base.Preconditions; +import com.google.common.base.Predicates; +import com.google.common.collect.FluentIterable; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; + public class DataNormalizer { private final DataNormalizationOperation operation; @@ -72,6 +72,16 @@ public class DataNormalizer { return InstanceIdentifier.create(normalizedArgs.build()); } + public DataNormalizationOperation getOperation(final InstanceIdentifier legacy) throws DataNormalizationException { + DataNormalizationOperation currentOp = operation; + Iterator arguments = legacy.getPathArguments().iterator(); + + while (arguments.hasNext()) { + currentOp = currentOp.getChild(arguments.next()); + } + return currentOp; + } + public Map.Entry> toNormalized( final Map.Entry legacy) { return toNormalized(legacy.getKey(), legacy.getValue()); @@ -120,7 +130,7 @@ public class DataNormalizer { DataNormalizationOperation currentOp = operation; for (PathArgument normalizedArg : normalized.getPathArguments()) { currentOp = currentOp.getChild(normalizedArg); - if(!currentOp.isMixin()) { + if (!currentOp.isMixin()) { legacyArgs.add(normalizedArg); } } @@ -134,7 +144,7 @@ public class DataNormalizer { return toLegacyFromDataContainer((DataContainerNode) normalizedData); } else if (normalizedData instanceof AnyXmlNode) { Node value = ((AnyXmlNode) normalizedData).getValue(); - return value instanceof CompositeNode ? (CompositeNode)value : null; + return value instanceof CompositeNode ? (CompositeNode) value : null; } return null; } @@ -169,7 +179,7 @@ public class DataNormalizer { for (NormalizedNode child : node.getValue()) { if (child instanceof MixinNode && child instanceof NormalizedNodeContainer) { builder.addAll(toLegacyNodesFromMixin((NormalizedNodeContainer) child)); - } else if( child instanceof UnkeyedListNode) { + } else if (child instanceof UnkeyedListNode) { builder.addAll(toLegacyNodesFromUnkeyedList((UnkeyedListNode) child)); } else { addToBuilder(builder, toLegacy(child)); diff --git a/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java b/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java deleted file mode 100644 index 3894fbe200..0000000000 --- a/opendaylight/md-sal/sal-compability/src/main/java/org/opendaylight/controller/sal/compability/ToSalPropertyClassUtils.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.controller.sal.compability; - -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector; -import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures; -import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.node.NodeConnector; - -public class ToSalPropertyClassUtils { - public static Bandwidth salAdvertisedBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); - PortFeatures portFeatures = flowCapNodeConn.getAdvertisedFeatures(); - return new AdvertisedBandwidth(resolveBandwidth(portFeatures)); - } - - public static Bandwidth salPeerBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); - PortFeatures portFeatures = flowCapNodeConn.getPeerFeatures(); - return new PeerBandwidth(resolveBandwidth(portFeatures)); - } - - public static Bandwidth salSupportedBandwidthFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); - PortFeatures portFeatures = flowCapNodeConn.getSupported(); - return new SupportedBandwidth(resolveBandwidth(portFeatures)); - } - - public static MacAddress salMacAddressFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); - String hwAddress = flowCapNodeConn.getHardwareAddress().getValue(); - return new MacAddress(bytesFrom(hwAddress)); - } - - - public static Name salNameFrom(NodeConnector nodeConnector) { - FlowCapableNodeConnector flowCapNodeConn = nodeConnector.getAugmentation(FlowCapableNodeConnector.class); - return new Name(flowCapNodeConn.getName()); - } - - - - private static byte[] bytesFrom(String hwAddress) { - String[] mac = hwAddress.split(":"); - byte[] macAddress = new byte[6]; // mac.length == 6 bytes - for (int i = 0; i < mac.length; i++) { - macAddress[i] = Integer.decode("0x" + mac[i]).byteValue(); - } - return macAddress; - } - - private static long resolveBandwidth(PortFeatures portFeatures) { - if (portFeatures.is_1tbFd()) { - return Bandwidth.BW1Tbps; - } else if (portFeatures.is_100gbFd()) { - return Bandwidth.BW100Gbps; - } else if (portFeatures.is_40gbFd()) { - return Bandwidth.BW40Gbps; - } else if (portFeatures.is_10gbFd()) { - return Bandwidth.BW10Gbps; - } else if (portFeatures.is_1gbHd() || portFeatures.is_1gbFd()) { - return Bandwidth.BW1Gbps; - } else if (portFeatures.is_100mbHd() || portFeatures.is_100mbFd()) { - return Bandwidth.BW100Mbps; - } else if (portFeatures.is_10mbHd() || portFeatures.is_10mbFd()) { - return Bandwidth.BW10Mbps; - } else { - return Bandwidth.BWUNK; - } - } - -} diff --git a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java index 8fc6fe2295..32139308b1 100644 --- a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java +++ b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/sal/dom/broker/impl/SchemaAwareRpcBroker.java @@ -14,6 +14,7 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import com.google.common.base.Preconditions; import org.opendaylight.controller.md.sal.common.api.routing.RouteChange; import org.opendaylight.controller.md.sal.common.api.routing.RouteChangeListener; import org.opendaylight.controller.md.sal.common.impl.routing.RoutingUtils; @@ -140,17 +141,34 @@ public class SchemaAwareRpcBroker implements RpcRouter, Identifiable, Ro RpcDefinition definition = findRpcDefinition(rpcType); checkArgument(!isRoutedRpc(definition), "RPC Type must not be routed."); GlobalRpcRegistration reg = new GlobalRpcRegistration(rpcType, implementation, this); - implementations.putIfAbsent(rpcType, implementation); + final RpcImplementation previous = implementations.putIfAbsent(rpcType, implementation); + Preconditions.checkState(previous == null, "Rpc %s is already registered.",rpcType); + notifyRpcAdded(rpcType); return reg; } + private void notifyRpcAdded(QName rpcType) { + for (ListenerRegistration listener : rpcRegistrationListeners) { + try { + listener.getInstance().onRpcImplementationAdded(rpcType); + } catch (Exception ex) { + LOG.error("Unhandled exception during invoking listener {}", listener.getInstance(), ex); + } + + } + } + private boolean isRoutedRpc(RpcDefinition definition) { return getRoutingStrategy(definition) instanceof RoutedRpcStrategy; } @Override public ListenerRegistration addRpcRegistrationListener(RpcRegistrationListener listener) { - return rpcRegistrationListeners.register(listener); + ListenerRegistration reg = rpcRegistrationListeners.register(listener); + for (QName impl : implementations.keySet()) { + listener.onRpcImplementationAdded(impl); + } + return reg; } @Override diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml index dadef821eb..906847426c 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml +++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml @@ -105,9 +105,19 @@ org.slf4j slf4j-simple - ${slf4j.version} test + + org.opendaylight.yangtools + binding-generator-impl + test + + + org.opendaylight.controller + sal-test-model + test + ${project.version} + diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java index af479743aa..743ddd1ae0 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/DOMImmutableDataChangeEvent.java @@ -30,7 +30,7 @@ public final class DOMImmutableDataChangeEvent implements private final NormalizedNode original; private final NormalizedNode updated; - private final Map> originalData; + private final Map> originalData; private final Map> createdData; private final Map> updatedData; private final Set removedPaths; @@ -67,7 +67,7 @@ public final class DOMImmutableDataChangeEvent implements } @Override - public Map> getOriginalData() { + public Map> getOriginalData() { return originalData; } diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java index 71a3534c81..b679de54d6 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/main/java/org/opendaylight/controller/md/sal/dom/store/impl/ResolveDataChangeEventsTask.java @@ -7,12 +7,17 @@ */ package org.opendaylight.controller.md.sal.dom.store.impl; -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.collect.Multimap; +import static org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.builder; + +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Map.Entry; +import java.util.Set; +import java.util.concurrent.Callable; + import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.Builder; import org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.SimpleEventFactory; @@ -32,16 +37,12 @@ import org.opendaylight.yangtools.yang.data.api.schema.tree.ModificationType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map.Entry; -import java.util.Set; -import java.util.concurrent.Callable; - -import static org.opendaylight.controller.md.sal.dom.store.impl.DOMImmutableDataChangeEvent.builder; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.collect.Multimap; /** * Resolve Data Change Events based on modifications and listeners @@ -438,17 +439,19 @@ final class ResolveDataChangeEventsTask implements Callable childListeners = getListenerChildrenWildcarded(listeners, childId); + switch (childMod.getModificationType()) { case WRITE: case MERGE: case DELETE: one.merge(resolveAnyChangeEvent(childPath, childListeners, childMod)); + oneModified = true; break; case SUBTREE_MODIFIED: subtree.merge(resolveSubtreeChangeEvent(childPath, childListeners, childMod)); @@ -458,11 +461,20 @@ final class ResolveDataChangeEventsTask implements Callable top() { + return Builders.containerBuilder().withNodeIdentifier( + new NodeIdentifier(Top.QNAME)); + } + + + + protected static void assertEmpty(final Collection set) { + Assert.assertTrue(set.isEmpty()); + } + + protected static void assertEmpty(final Map set) { + Assert.assertTrue(set.isEmpty()); + } + + protected static void assertContains(final Collection set, final K... values) { + for (K key : values) { + Assert.assertTrue(set.contains(key)); + } + + } + + protected static void assertNotContains(final Collection set, final K... values) { + for (K key : values) { + Assert.assertFalse(set.contains(key)); + } + } + + protected static void assertContains(final Map map, final K... values) { + for (K key : values) { + Assert.assertTrue(map.containsKey(key)); + } + } + + protected static void assertNotContains(final Map map, final K... values) { + for (K key : values) { + Assert.assertFalse(map.containsKey(key)); + } + } + + protected static CollectionNodeBuilder topLevelMap() { + return ImmutableNodes.mapNodeBuilder(TopLevelList.QNAME); + } + + protected static CollectionNodeBuilder nestedMap() { + return Builders.orderedMapBuilder().withNodeIdentifier(new NodeIdentifier(NestedList.QNAME)); + } + + public static DataContainerNodeBuilder topLevelList( + final String key) { + return ImmutableNodes.mapEntryBuilder(TopLevelList.QNAME, NAME_QNAME, + key); + } + + public static DataContainerNodeBuilder nestedList( + final String key) { + return ImmutableNodes + .mapEntryBuilder(NestedList.QNAME, NAME_QNAME, key); + } + + public static final WriteTransactionCustomizer writeOneTopMultipleNested( + final String topName, final String... nestedName) { + CollectionNodeBuilder nestedMapBuilder = nestedMap(); + for (String nestedItem : nestedName) { + nestedMapBuilder.addChild(nestedList(nestedItem).build()); + } + + final ContainerNode data = top().addChild( + topLevelMap().addChild( + topLevelList(topName) + .addChild(nestedMapBuilder.build()).build()) + .build()).build(); + + return DatastoreTestTask.simpleWrite(TOP_LEVEL, data); + } + + public static final WriteTransactionCustomizer deleteNested(final String topName, + final String nestedName) { + return DatastoreTestTask.simpleDelete(path(topName, nestedName)); + } +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java new file mode 100644 index 0000000000..8ac93b1804 --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DatastoreTestTask.java @@ -0,0 +1,174 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import static org.junit.Assert.assertTrue; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeListener; +import org.opendaylight.controller.sal.core.spi.data.DOMStore; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadTransaction; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreThreePhaseCommitCohort; +import org.opendaylight.yangtools.concepts.ListenerRegistration; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +import com.google.common.base.Preconditions; +import com.google.common.util.concurrent.SettableFuture; + +public class DatastoreTestTask { + + private final DOMStore store; + private AsyncDataChangeListener> changeListener; + + private WriteTransactionCustomizer setup; + private WriteTransactionCustomizer write; + private ReadTransactionVerifier read; + private WriteTransactionCustomizer cleanup; + private InstanceIdentifier changePath; + private DataChangeScope changeScope; + private boolean postSetup = false; + private final ChangeEventListener internalListener; + + public DatastoreTestTask(final DOMStore datastore) { + this.store = datastore; + internalListener = new ChangeEventListener(); + } + + public DatastoreTestTask changeListener(final InstanceIdentifier path, final DataChangeScope scope, + final AsyncDataChangeListener> changeListener) { + this.changeListener = changeListener; + this.changePath = path; + this.changeScope = scope; + return this; + } + + public DatastoreTestTask changeListener(final InstanceIdentifier path, final DataChangeScope scope) { + this.changePath = path; + this.changeScope = scope; + return this; + } + + public DatastoreTestTask setup(final WriteTransactionCustomizer setup) { + this.setup = setup; + return this; + } + + public DatastoreTestTask test(final WriteTransactionCustomizer write) { + this.write = write; + return this; + } + + public DatastoreTestTask read(final ReadTransactionVerifier read) { + this.read = read; + return this; + } + + public DatastoreTestTask cleanup(final WriteTransactionCustomizer cleanup) { + this.cleanup = cleanup; + return this; + } + + public void run() throws InterruptedException, ExecutionException { + if (setup != null) { + execute(setup); + } + ListenerRegistration registration = null; + if (changePath != null) { + registration = store.registerChangeListener(changePath, internalListener, changeScope); + } + + Preconditions.checkState(write != null, "Write Transaction must be set."); + postSetup = true; + execute(write); + if (registration != null) { + registration.close(); + } + if (changeListener != null) { + changeListener.onDataChanged(internalListener.receivedChange.get()); + } + if (read != null) { + read.verify(store.newReadOnlyTransaction()); + } + if (cleanup != null) { + execute(cleanup); + } + } + + public Future>> getChangeEvent() { + return internalListener.receivedChange; + } + + private void execute(final WriteTransactionCustomizer writeCustomizer) throws InterruptedException, + ExecutionException { + DOMStoreReadWriteTransaction tx = store.newReadWriteTransaction(); + writeCustomizer.customize(tx); + DOMStoreThreePhaseCommitCohort cohort = tx.ready(); + assertTrue(cohort.canCommit().get()); + cohort.preCommit().get(); + cohort.commit().get(); + } + + public interface WriteTransactionCustomizer { + public void customize(DOMStoreReadWriteTransaction tx); + } + + public interface ReadTransactionVerifier { + public void verify(DOMStoreReadTransaction tx); + } + + private final class ChangeEventListener implements + AsyncDataChangeListener> { + + protected final SettableFuture>> receivedChange = SettableFuture + .create(); + + @Override + public void onDataChanged(final AsyncDataChangeEvent> change) { + if (postSetup) { + receivedChange.set(change); + } + } + } + + public static final WriteTransactionCustomizer simpleWrite(final InstanceIdentifier path, + final NormalizedNode data) { + return new WriteTransactionCustomizer() { + + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.write(path, data); + } + }; + } + + public static final WriteTransactionCustomizer simpleMerge(final InstanceIdentifier path, + final NormalizedNode data) { + return new WriteTransactionCustomizer() { + + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.merge(path, data); + } + }; + } + + public static final WriteTransactionCustomizer simpleDelete(final InstanceIdentifier path) { + return new WriteTransactionCustomizer() { + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.delete(path); + } + }; + } +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java new file mode 100644 index 0000000000..54d2043dc7 --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/DefaultDataChangeListenerTestSuite.java @@ -0,0 +1,134 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import java.util.concurrent.ExecutionException; + +import org.junit.Test; +import org.opendaylight.controller.md.sal.dom.store.impl.DatastoreTestTask.WriteTransactionCustomizer; +import org.opendaylight.controller.sal.core.spi.data.DOMStoreReadWriteTransaction; + +public abstract class DefaultDataChangeListenerTestSuite extends AbstractDataChangeListenerTest { + + protected static final String FOO_SIBLING = "foo-sibling"; + + abstract protected void customizeTask(DatastoreTestTask task); + + @Test + public final void putTopLevelOneNested() throws InterruptedException, ExecutionException { + + DatastoreTestTask task = newTestTask().test(writeOneTopMultipleNested(FOO, BAR)); + customizeTask(task); + task.run(); + putTopLevelOneNested(task); + } + + @Test + public final void existingTopWriteSibling() throws InterruptedException, ExecutionException { + DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO)).test( + new WriteTransactionCustomizer() { + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.write(path(FOO_SIBLING), topLevelList(FOO_SIBLING).build()); + } + }); + customizeTask(task); + task.run(); + existingTopWriteSibling(task); + } + + protected abstract void existingTopWriteSibling(DatastoreTestTask task) throws InterruptedException, ExecutionException; + + + @Test + public final void existingTopWriteTwoNested() throws InterruptedException, ExecutionException { + DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO)).test( + new WriteTransactionCustomizer() { + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.write(path(FOO,BAR), nestedList(BAR).build()); + tx.write(path(FOO,BAZ), nestedList(BAZ).build()); + } + }); + customizeTask(task); + task.run(); + existingTopWriteTwoNested(task); + } + + protected abstract void existingTopWriteTwoNested(DatastoreTestTask task) throws InterruptedException, ExecutionException; + + + @Test + public final void existingOneNestedWriteAdditionalNested() throws InterruptedException, ExecutionException { + DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR)).test( + new WriteTransactionCustomizer() { + @Override + public void customize(final DOMStoreReadWriteTransaction tx) { + tx.write(path(FOO,BAZ), nestedList(BAZ).build()); + } + }); + customizeTask(task); + task.run(); + existingOneNestedWriteAdditionalNested(task); + } + + protected abstract void existingOneNestedWriteAdditionalNested(DatastoreTestTask task) throws InterruptedException, ExecutionException; + + protected abstract void putTopLevelOneNested(DatastoreTestTask task) throws InterruptedException, + ExecutionException; + + @Test + public final void replaceTopLevelNestedChanged() throws InterruptedException, ExecutionException { + DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR)).test( + writeOneTopMultipleNested(FOO, BAZ)); + customizeTask(task); + task.run(); + replaceTopLevelNestedChanged(task); + } + + protected abstract void replaceTopLevelNestedChanged(DatastoreTestTask task) throws InterruptedException, + ExecutionException; + + @Test + public final void putTopLevelWithTwoNested() throws InterruptedException, ExecutionException { + + DatastoreTestTask task = newTestTask().test(writeOneTopMultipleNested(FOO, BAR, BAZ)); + customizeTask(task); + task.run(); + putTopLevelWithTwoNested(task); + } + + protected abstract void putTopLevelWithTwoNested(DatastoreTestTask task) throws InterruptedException, + ExecutionException; + + @Test + public final void twoNestedExistsOneIsDeleted() throws InterruptedException, ExecutionException { + + DatastoreTestTask task = newTestTask().setup(writeOneTopMultipleNested(FOO, BAR, BAZ)).test( + deleteNested(FOO, BAZ)); + customizeTask(task); + task.run(); + twoNestedExistsOneIsDeleted(task); + } + + protected abstract void twoNestedExistsOneIsDeleted(DatastoreTestTask task) throws InterruptedException, + ExecutionException; + + @Test + public final void nestedListExistsRootDeleted() throws InterruptedException, ExecutionException { + + DatastoreTestTask task = newTestTask().cleanup(null).setup(writeOneTopMultipleNested(FOO, BAR, BAZ)) + .test(DatastoreTestTask.simpleDelete(TOP_LEVEL)); + customizeTask(task); + task.run(); + nestedListExistsRootDeleted(task); + } + + protected abstract void nestedListExistsRootDeleted(DatastoreTestTask task) throws InterruptedException, + ExecutionException; +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java index 369a7da138..96369dea5f 100644 --- a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/InMemoryDataStoreTest.java @@ -1,8 +1,18 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.controller.md.sal.dom.store.impl; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.ListenableFuture; -import com.google.common.util.concurrent.MoreExecutors; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.concurrent.ExecutionException; + import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -14,11 +24,9 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import java.util.concurrent.ExecutionException; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.MoreExecutors; public class InMemoryDataStoreTest { @@ -237,7 +245,7 @@ public class InMemoryDataStoreTest { /** * Reads /test from readTx Read should return container. */ - private static Optional> assertTestContainerExists(DOMStoreReadTransaction readTx) + private static Optional> assertTestContainerExists(final DOMStoreReadTransaction readTx) throws InterruptedException, ExecutionException { ListenableFuture>> writeTxContainer = readTx.read(TestModel.TEST_PATH); diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java new file mode 100644 index 0000000000..ef2a4743e2 --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/RootScopeSubtreeTest.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import java.util.concurrent.ExecutionException; + +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +public class RootScopeSubtreeTest extends DefaultDataChangeListenerTestSuite { + + @Override + protected void customizeTask(final DatastoreTestTask task) { + task.changeListener(TOP_LEVEL, DataChangeScope.SUBTREE); + } + + @Override + public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), TOP_LEVEL, path(FOO), path(FOO, BAR)); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + } + + @Override + public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO, BAZ)); + assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO)); + assertContains(change.getRemovedPaths(), path(FOO, BAR)); + } + + @Override + protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), TOP_LEVEL, path(FOO), path(FOO, BAR), path(FOO, BAZ)); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + } + + @Override + protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertEmpty(change.getCreatedData()); + assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO)); + assertContains(change.getRemovedPaths(), path(FOO, BAZ)); + } + + @Override + protected void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertEmpty(change.getCreatedData()); + assertEmpty(change.getUpdatedData()); + assertContains(change.getRemovedPaths(), TOP_LEVEL, path(FOO), path(FOO, BAR), path(FOO, BAZ)); + } + + @Override + protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO,BAZ)); + assertNotContains(change.getCreatedData(), path(FOO,BAR)); + assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO)); + assertEmpty(change.getRemovedPaths()); + } + + @Override + protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ)); + assertContains(change.getUpdatedData(), TOP_LEVEL, path(FOO)); + assertNotContains(change.getUpdatedData(), path(FOO,BAR)); + assertEmpty(change.getRemovedPaths()); + } + + @Override + protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO_SIBLING)); + assertContains(change.getUpdatedData(), TOP_LEVEL); + assertNotContains(change.getUpdatedData(), path(FOO)); + assertEmpty(change.getRemovedPaths()); + } +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java new file mode 100644 index 0000000000..4c1a860f2a --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeBaseTest.java @@ -0,0 +1,140 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +public class WildcardedScopeBaseTest extends DefaultDataChangeListenerTestSuite { + + private static final InstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( + TopLevelList.QNAME); + + @Override + protected void customizeTask(final DatastoreTestTask task) { + task.changeListener(TOP_LEVEL_LIST_ALL, DataChangeScope.BASE); + } + + @Override + public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertNotNull(change); + + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR)); + + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + + assertContains(change.getCreatedData(), path(FOO, BAZ)); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO, BAR)); + + } + + @Override + protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + assertFalse(change.getCreatedData().isEmpty()); + + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR), path(FOO, BAZ)); + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + Future future = task.getChangeEvent(); + /* + * Base listener should be notified only and only if actual node changed its state, + * since deletion of child, did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertEmpty(change.getCreatedData()); + assertEmpty(change.getUpdatedData()); + + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO),path(FOO, BAZ),path(FOO,BAR)); + } + + @Override + protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) { + Future future = task.getChangeEvent(); + /* + * One listener should be notified only and only if actual node changed its state, + * since deletion of nested child (in this case /nested-list/nested-list[foo], + * did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + Future future = task.getChangeEvent(); + /* + * One listener should be notified only and only if actual node changed its state, + * since deletion of nested child (in this case /nested-list/nested-list[foo], + * did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO_SIBLING)); + assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL); + assertEmpty(change.getRemovedPaths()); + } +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java new file mode 100644 index 0000000000..1f2cb224ab --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeOneTest.java @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +public class WildcardedScopeOneTest extends DefaultDataChangeListenerTestSuite { + + private static final InstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( + TopLevelList.QNAME); + + @Override + protected void customizeTask(final DatastoreTestTask task) { + task.changeListener(TOP_LEVEL_LIST_ALL, DataChangeScope.ONE); + } + + @Override + public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertNotNull(change); + + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR)); + + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + + assertContains(change.getCreatedData(), path(FOO, BAZ)); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO, BAR)); + + } + + @Override + protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + assertFalse(change.getCreatedData().isEmpty()); + + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR), path(FOO, BAZ)); + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + Future future = task.getChangeEvent(); + /* + * One listener should be notified only and only if actual node changed its state, + * since deletion of nested child (in this case /nested-list/nested-list[foo], + * did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertEmpty(change.getCreatedData()); + assertEmpty(change.getUpdatedData()); + + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO),path(FOO, BAZ),path(FOO,BAR)); + } + + @Override + protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) { + Future future = task.getChangeEvent(); + /* + * One listener should be notified only and only if actual node changed its state, + * since deletion of nested child (in this case /nested-list/nested-list[foo], + * did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + Future future = task.getChangeEvent(); + /* + * One listener should be notified only and only if actual node changed its state, + * since deletion of nested child (in this case /nested-list/nested-list[foo], + * did not result in change of node we are listening + * for, we should not be getting data change event + * and this means settable future containing receivedDataChangeEvent is not done. + * + */ + assertFalse(future.isDone()); + } + + @Override + protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO_SIBLING)); + assertNotContains(change.getUpdatedData(),path(FOO), TOP_LEVEL); + assertEmpty(change.getRemovedPaths()); + } +} diff --git a/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java new file mode 100644 index 0000000000..010204888b --- /dev/null +++ b/opendaylight/md-sal/sal-inmemory-datastore/src/test/java/org/opendaylight/controller/md/sal/dom/store/impl/WildcardedScopeSubtreeTest.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.dom.store.impl; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.util.concurrent.ExecutionException; + +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; +import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +public class WildcardedScopeSubtreeTest extends DefaultDataChangeListenerTestSuite { + + private static final InstanceIdentifier TOP_LEVEL_LIST_ALL = TOP_LEVEL.node(TopLevelList.QNAME).node( + TopLevelList.QNAME); + + @Override + protected void customizeTask(final DatastoreTestTask task) { + task.changeListener(TOP_LEVEL_LIST_ALL, DataChangeScope.SUBTREE); + } + + @Override + public void putTopLevelOneNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR)); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + public void replaceTopLevelNestedChanged(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + + assertContains(change.getCreatedData(), path(FOO, BAZ)); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO, BAR)); + + } + + @Override + protected void putTopLevelWithTwoNested(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + assertFalse(change.getCreatedData().isEmpty()); + + assertContains(change.getCreatedData(), path(FOO), path(FOO, BAR), path(FOO, BAZ)); + assertNotContains(change.getCreatedData(), TOP_LEVEL); + assertEmpty(change.getUpdatedData()); + assertEmpty(change.getRemovedPaths()); + + } + + @Override + protected void twoNestedExistsOneIsDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + assertNotNull(change); + assertTrue(change.getCreatedData().isEmpty()); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(),path(FOO, BAZ)); + } + + @Override + public void nestedListExistsRootDeleted(final DatastoreTestTask task) throws InterruptedException, + ExecutionException { + + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertEmpty(change.getCreatedData()); + assertEmpty(change.getUpdatedData()); + + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertContains(change.getRemovedPaths(), path(FOO),path(FOO, BAZ),path(FOO,BAR)); + } + + @Override + protected void existingOneNestedWriteAdditionalNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO,BAZ)); + assertNotContains(change.getCreatedData(), path(FOO,BAR)); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL); + assertEmpty(change.getRemovedPaths()); + } + + @Override + protected void existingTopWriteTwoNested(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO,BAR),path(FOO,BAZ)); + assertContains(change.getUpdatedData(), path(FOO)); + assertNotContains(change.getUpdatedData(), TOP_LEVEL, path(FOO,BAR)); + assertEmpty(change.getRemovedPaths()); + } + + @Override + protected void existingTopWriteSibling(final DatastoreTestTask task) throws InterruptedException, ExecutionException { + AsyncDataChangeEvent> change = task.getChangeEvent().get(); + + assertContains(change.getCreatedData(), path(FOO_SIBLING)); + assertNotContains(change.getUpdatedData(), path(FOO), TOP_LEVEL); + assertEmpty(change.getRemovedPaths()); + } +} diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java index 21f94474f8..f9e6239bed 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/schema/mapping/NetconfMessageTransformer.java @@ -55,7 +55,7 @@ public class NetconfMessageTransformer implements MessageTransformer notifications = ctx.getNotifications(); final Document document = message.getDocument(); - return XmlDocumentUtils.notificationToDomNodes(document, Optional.fromNullable(notifications)); + return XmlDocumentUtils.notificationToDomNodes(document, Optional.fromNullable(notifications), ctx); } @Override diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfToNotificationTest.java b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfToNotificationTest.java new file mode 100644 index 0000000000..521a55df68 --- /dev/null +++ b/opendaylight/md-sal/sal-netconf-connector/src/test/java/org/opendaylight/controller/sal/connect/netconf/NetconfToNotificationTest.java @@ -0,0 +1,64 @@ +package org.opendaylight.controller.sal.connect.netconf; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; + +import java.io.InputStream; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +import javax.xml.parsers.DocumentBuilderFactory; +import org.junit.Before; +import org.junit.Test; +import org.opendaylight.controller.netconf.api.NetconfMessage; +import org.opendaylight.controller.netconf.util.xml.XmlUtil; +import org.opendaylight.controller.sal.connect.netconf.schema.mapping.NetconfMessageTransformer; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangContextParser; +import org.opendaylight.yangtools.yang.parser.impl.YangParserImpl; +import org.w3c.dom.Document; + +/** + * @author Lukas Sedlak + */ +public class NetconfToNotificationTest { + + NetconfMessageTransformer messageTransformer; + + NetconfMessage userNotification; + + @Before + public void setup() throws Exception { + final List modelsToParse = Collections.singletonList(getClass().getResourceAsStream("/schemas/user-notification.yang")); + final YangContextParser parser = new YangParserImpl(); + final Set modules = parser.parseYangModelsFromStreams(modelsToParse); + assertTrue(!modules.isEmpty()); + final SchemaContext schemaContext = parser.resolveSchemaContext(modules); + assertNotNull(schemaContext); + + messageTransformer = new NetconfMessageTransformer(); + messageTransformer.onGlobalContextUpdated(schemaContext); + + final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + factory.setNamespaceAware(true); + InputStream notifyPayloadStream = getClass().getResourceAsStream("/notification-payload.xml"); + assertNotNull(notifyPayloadStream); + + final Document doc = XmlUtil.readXmlToDocument(notifyPayloadStream); + assertNotNull(doc); + userNotification = new NetconfMessage(doc); + } + + @Test + public void test() throws Exception { + final CompositeNode root = messageTransformer.toNotification(userNotification); + + assertNotNull(root); + assertEquals(6, root.size()); + assertEquals("user-visited-page", root.getKey().getLocalName()); + } +} diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/resources/notification-payload.xml b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/notification-payload.xml new file mode 100644 index 0000000000..837fcc1a70 --- /dev/null +++ b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/notification-payload.xml @@ -0,0 +1,14 @@ + +2014-07-08T11:20:48UTC + + ui:public-user + 172.23.29.104 + 00:11:00:ff:dd:02 + Chrome 35.0.1916.153 m + + Slovakia + UTC/GMT+2 + + 2014-07-08 11:20:48 + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-netconf-connector/src/test/resources/schemas/user-notification.yang b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/schemas/user-notification.yang new file mode 100644 index 0000000000..50d220689f --- /dev/null +++ b/opendaylight/md-sal/sal-netconf-connector/src/test/resources/schemas/user-notification.yang @@ -0,0 +1,56 @@ +module user-notification { + yang-version 1; + namespace "org:opendaylight:notification:test:ns:yang:user-notification"; + prefix "user"; + + organization "Cisco Systems"; + contact "Lukas Sedlak"; + description "Test model for testing notifications"; + + revision "2014-07-08" { + description "Initial revision"; + } + + identity user-identity { + description "Identity of user incoming to Web Page"; + } + + identity public-user { + base user-identity; + description "Identity of random public non-registered user"; + } + + notification user-visited-page { + leaf incoming-user { + type identityref { + base "user-identity"; + } + } + + leaf ip-address { + type string; + } + + leaf mac { + type string; + } + + leaf browser-id { + type string; + } + + container region { + leaf name { + type string; + } + + leaf time-zone { + type string; + } + } + + leaf visiting-date { + type string; + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST b/opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST index 778d8c6162..d0be2cbcbb 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/README-FIRST @@ -20,4 +20,9 @@ machine protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto -5. Run mvn clean install and resolve any trailing spaces issues & build the .jar +5. Run mvn clean install & build the .jar + +6. !!!WARNING!!! - never edit the generated sources files of protocol buffer + +7. !!!NOTE!!! if you are planning to add new .proto file option java_package should begin with + org.opendaylight.controller.protobuff.messages to properly exclude from sonar. diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh b/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh index b14da29f0a..c9e586ba1a 100755 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/run.sh @@ -22,11 +22,17 @@ # or run command # protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto # -#5. Run mvn clean install and resolve any trailing spaces issues & build the .jar +#5. Run mvn clean install & build the .jar +# +#6 !!!WARNING!!!! never edit the source files generated +# +#7. !!!NOTE!!! if you are planning to add new .proto file option java_package should begin with +# org.opendaylight.controller.protobuff.messages to properly exclude from sonar. ######################################################################################################## protoc --proto_path=src/main/resources --java_out=src/main/java src/main/resources/*.proto echo "Done generating Java source files." +#to remove trailing spaces in the code files find src/main/java -type f -name '*.java' -exec sed --in-place 's/[[:space:]]\+$//' {} \+ diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/registration/ListenerRegistrationMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/registration/ListenerRegistrationMessages.java deleted file mode 100644 index 8d82f8b387..0000000000 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/registration/ListenerRegistrationMessages.java +++ /dev/null @@ -1,746 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: ListenerRegistration.proto - -package org.opendaylight.controller.cluster.datastore.registration; - -public final class ListenerRegistrationMessages { - private ListenerRegistrationMessages() {} - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface CloseOrBuilder extends com.google.protobuf.MessageOrBuilder { - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.Close} - */ - public static final class Close extends com.google.protobuf.GeneratedMessage - implements CloseOrBuilder { - // Use Close.newBuilder() to construct. - private Close(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private Close(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final Close defaultInstance; - - public static Close getDefaultInstance() { - return defaultInstance; - } - - public Close getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private Close(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close.class, - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Close parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Close(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() {} - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.Close} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close.class, - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close build() { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close buildPartial() { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close result = - new org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close( - this); - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close other) { - if (other == org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close - .getDefaultInstance()) - return this; - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.Close) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.Close) - } - - static { - defaultInstance = new Close(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.Close) - } - - public interface CloseReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseReply} - */ - public static final class CloseReply extends - com.google.protobuf.GeneratedMessage implements CloseReplyOrBuilder { - // Use CloseReply.newBuilder() to construct. - private CloseReply(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private CloseReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final CloseReply defaultInstance; - - public static CloseReply getDefaultInstance() { - return defaultInstance; - } - - public CloseReply getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private CloseReply(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply.class, - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CloseReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseReply(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() {} - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseReply} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply.class, - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply build() { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply buildPartial() { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply result = - new org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply( - this); - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply other) { - if (other == org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply - .getDefaultInstance()) - return this; - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.registration.ListenerRegistrationMessages.CloseReply) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseReply) - } - - static { - defaultInstance = new CloseReply(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseReply) - } - - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_Close_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - static { - java.lang.String[] descriptorData = - {"\n\032ListenerRegistration.proto\022!org.openda" - + "ylight.controller.mdsal\"\007\n\005Close\"\014\n\nClos" - + "eReplyBZ\n:org.opendaylight.controller.cl" - + "uster.datastore.registrationB\034ListenerRe" - + "gistrationMessages"}; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_Close_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_Close_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor, - new java.lang.String[] {}); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{}, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionChainMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionChainMessages.java deleted file mode 100644 index 08ddf38a44..0000000000 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionChainMessages.java +++ /dev/null @@ -1,1647 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: ShardTransactionChain.proto - -package org.opendaylight.controller.cluster.datastore.transaction; - -public final class ShardTransactionChainMessages { - private ShardTransactionChainMessages() {} - - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface CloseTransactionChainOrBuilder extends - com.google.protobuf.MessageOrBuilder { - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChain} - */ - public static final class CloseTransactionChain extends - com.google.protobuf.GeneratedMessage implements - CloseTransactionChainOrBuilder { - // Use CloseTransactionChain.newBuilder() to construct. - private CloseTransactionChain( - com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private CloseTransactionChain(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final CloseTransactionChain defaultInstance; - - public static CloseTransactionChain getDefaultInstance() { - return defaultInstance; - } - - public CloseTransactionChain getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private CloseTransactionChain(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CloseTransactionChain parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseTransactionChain(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() {} - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChain} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain( - this); - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain - .getDefaultInstance()) - return this; - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChain) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseTransactionChain) - } - - static { - defaultInstance = new CloseTransactionChain(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransactionChain) - } - - public interface CloseTransactionChainReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChainReply} - */ - public static final class CloseTransactionChainReply extends - com.google.protobuf.GeneratedMessage implements - CloseTransactionChainReplyOrBuilder { - // Use CloseTransactionChainReply.newBuilder() to construct. - private CloseTransactionChainReply( - com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private CloseTransactionChainReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final CloseTransactionChainReply defaultInstance; - - public static CloseTransactionChainReply getDefaultInstance() { - return defaultInstance; - } - - public CloseTransactionChainReply getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private CloseTransactionChainReply( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CloseTransactionChainReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseTransactionChainReply(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() {} - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChainReply} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply( - this); - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply - .getDefaultInstance()) - return this; - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CloseTransactionChainReply) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseTransactionChainReply) - } - - static { - defaultInstance = new CloseTransactionChainReply(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransactionChainReply) - } - - public interface CreateTransactionChainOrBuilder extends - com.google.protobuf.MessageOrBuilder { - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChain} - */ - public static final class CreateTransactionChain extends - com.google.protobuf.GeneratedMessage implements - CreateTransactionChainOrBuilder { - // Use CreateTransactionChain.newBuilder() to construct. - private CreateTransactionChain( - com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private CreateTransactionChain(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final CreateTransactionChain defaultInstance; - - public static CreateTransactionChain getDefaultInstance() { - return defaultInstance; - } - - public CreateTransactionChain getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private CreateTransactionChain(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CreateTransactionChain parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateTransactionChain(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private void initFields() {} - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChain} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain( - this); - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain - .getDefaultInstance()) - return this; - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChain) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CreateTransactionChain) - } - - static { - defaultInstance = new CreateTransactionChain(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransactionChain) - } - - public interface CreateTransactionChainReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { - - // required string transactionChainPath = 1; - /** - * required string transactionChainPath = 1; - */ - boolean hasTransactionChainPath(); - - /** - * required string transactionChainPath = 1; - */ - java.lang.String getTransactionChainPath(); - - /** - * required string transactionChainPath = 1; - */ - com.google.protobuf.ByteString getTransactionChainPathBytes(); - } - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChainReply} - */ - public static final class CreateTransactionChainReply extends - com.google.protobuf.GeneratedMessage implements - CreateTransactionChainReplyOrBuilder { - // Use CreateTransactionChainReply.newBuilder() to construct. - private CreateTransactionChainReply( - com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - - private CreateTransactionChainReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } - - private static final CreateTransactionChainReply defaultInstance; - - public static CreateTransactionChainReply getDefaultInstance() { - return defaultInstance; - } - - public CreateTransactionChainReply getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private CreateTransactionChainReply( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { - done = true; - } - break; - } - case 10: { - bitField0_ |= 0x00000001; - transactionChainPath_ = input.readBytes(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public CreateTransactionChainReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateTransactionChainReply(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // required string transactionChainPath = 1; - public static final int TRANSACTIONCHAINPATH_FIELD_NUMBER = 1; - private java.lang.Object transactionChainPath_; - - /** - * required string transactionChainPath = 1; - */ - public boolean hasTransactionChainPath() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - - /** - * required string transactionChainPath = 1; - */ - public java.lang.String getTransactionChainPath() { - java.lang.Object ref = transactionChainPath_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - transactionChainPath_ = s; - } - return s; - } - } - - /** - * required string transactionChainPath = 1; - */ - public com.google.protobuf.ByteString getTransactionChainPathBytes() { - java.lang.Object ref = transactionChainPath_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); - transactionChainPath_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - private void initFields() { - transactionChainPath_ = ""; - } - - private byte memoizedIsInitialized = -1; - - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; - - if (!hasTransactionChainPath()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getTransactionChainPathBytes()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) - return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getTransactionChainPathBytes()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); - } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply prototype) { - return newBuilder().mergeFrom(prototype); - } - - public Builder toBuilder() { - return newBuilder(this); - } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - - /** - * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChainReply} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.Builder.class); - } - - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - transactionChainPath_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply - .getDefaultInstance(); - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply result = - buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply( - this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.transactionChainPath_ = transactionChainPath_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply) other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply - .getDefaultInstance()) - return this; - if (other.hasTransactionChainPath()) { - bitField0_ |= 0x00000001; - transactionChainPath_ = other.transactionChainPath_; - onChanged(); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasTransactionChainPath()) { - - return false; - } - return true; - } - - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parsedMessage = - null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionChainMessages.CreateTransactionChainReply) e - .getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - - private int bitField0_; - - // required string transactionChainPath = 1; - private java.lang.Object transactionChainPath_ = ""; - - /** - * required string transactionChainPath = 1; - */ - public boolean hasTransactionChainPath() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - - /** - * required string transactionChainPath = 1; - */ - public java.lang.String getTransactionChainPath() { - java.lang.Object ref = transactionChainPath_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); - transactionChainPath_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - - /** - * required string transactionChainPath = 1; - */ - public com.google.protobuf.ByteString getTransactionChainPathBytes() { - java.lang.Object ref = transactionChainPath_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); - transactionChainPath_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - /** - * required string transactionChainPath = 1; - */ - public Builder setTransactionChainPath(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - transactionChainPath_ = value; - onChanged(); - return this; - } - - /** - * required string transactionChainPath = 1; - */ - public Builder clearTransactionChainPath() { - bitField0_ = (bitField0_ & ~0x00000001); - transactionChainPath_ = getDefaultInstance().getTransactionChainPath(); - onChanged(); - return this; - } - - /** - * required string transactionChainPath = 1; - */ - public Builder setTransactionChainPathBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - transactionChainPath_ = value; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CreateTransactionChainReply) - } - - static { - defaultInstance = new CreateTransactionChainReply(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransactionChainReply) - } - - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { - return descriptor; - } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - static { - java.lang.String[] descriptorData = - {"\n\033ShardTransactionChain.proto\022!org.opend" - + "aylight.controller.mdsal\"\027\n\025CloseTransac" - + "tionChain\"\034\n\032CloseTransactionChainReply\"" - + "\030\n\026CreateTransactionChain\";\n\033CreateTrans" - + "actionChainReply\022\034\n\024transactionChainPath" - + "\030\001 \002(\tBZ\n9org.opendaylight.controller.cl" - + "uster.datastore.transactionB\035ShardTransa" - + "ctionChainMessages"}; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor, - new java.lang.String[] {"TransactionChainPath",}); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{}, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java index 9069e8f930..41eb2e6f92 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/util/EncoderDecoderUtil.java @@ -2,7 +2,7 @@ package org.opendaylight.controller.cluster.datastore.util; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage; +import org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/common/SimpleNormalizedNodeMessage.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java similarity index 58% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/common/SimpleNormalizedNodeMessage.java rename to opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java index 4fa8934d6d..67ab472d0c 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/common/SimpleNormalizedNodeMessage.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/common/SimpleNormalizedNodeMessage.java @@ -1,69 +1,60 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: SimpleNormalizedNode.proto -package org.opendaylight.controller.cluster.datastore.common; +package org.opendaylight.controller.protobuff.messages.common; public final class SimpleNormalizedNodeMessage { private SimpleNormalizedNodeMessage() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface NormalizedNodeXmlOrBuilder extends - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.ExtensionRegistry registry) { + } + public interface NormalizedNodeXmlOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required string nodeIdentifier = 1; /** * required string nodeIdentifier = 1; */ boolean hasNodeIdentifier(); - /** * required string nodeIdentifier = 1; */ java.lang.String getNodeIdentifier(); - /** * required string nodeIdentifier = 1; */ - com.google.protobuf.ByteString getNodeIdentifierBytes(); + com.google.protobuf.ByteString + getNodeIdentifierBytes(); // required string xmlString = 2; /** * required string xmlString = 2; */ boolean hasXmlString(); - /** * required string xmlString = 2; */ java.lang.String getXmlString(); - /** * required string xmlString = 2; */ - com.google.protobuf.ByteString getXmlStringBytes(); + com.google.protobuf.ByteString + getXmlStringBytes(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.NormalizedNodeXml} */ public static final class NormalizedNodeXml extends - com.google.protobuf.GeneratedMessage implements - NormalizedNodeXmlOrBuilder { + com.google.protobuf.GeneratedMessage + implements NormalizedNodeXmlOrBuilder { // Use NormalizedNodeXml.newBuilder() to construct. - private NormalizedNodeXml( - com.google.protobuf.GeneratedMessage.Builder builder) { + private NormalizedNodeXml(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private NormalizedNodeXml(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private NormalizedNodeXml(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final NormalizedNodeXml defaultInstance; - public static NormalizedNodeXml getDefaultInstance() { return defaultInstance; } @@ -73,13 +64,13 @@ public final class SimpleNormalizedNodeMessage { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private NormalizedNodeXml(com.google.protobuf.CodedInputStream input, + private NormalizedNodeXml( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -95,8 +86,8 @@ public final class SimpleNormalizedNodeMessage { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -123,27 +114,27 @@ public final class SimpleNormalizedNodeMessage { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.class, - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder.class); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.class, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public NormalizedNodeXml parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new NormalizedNodeXml(input, extensionRegistry); - } - }; + public NormalizedNodeXml parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new NormalizedNodeXml(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -154,14 +145,12 @@ public final class SimpleNormalizedNodeMessage { // required string nodeIdentifier = 1; public static final int NODEIDENTIFIER_FIELD_NUMBER = 1; private java.lang.Object nodeIdentifier_; - /** * required string nodeIdentifier = 1; */ public boolean hasNodeIdentifier() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string nodeIdentifier = 1; */ @@ -179,15 +168,16 @@ public final class SimpleNormalizedNodeMessage { return s; } } - /** * required string nodeIdentifier = 1; */ - public com.google.protobuf.ByteString getNodeIdentifierBytes() { + public com.google.protobuf.ByteString + getNodeIdentifierBytes() { java.lang.Object ref = nodeIdentifier_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); nodeIdentifier_ = b; return b; } else { @@ -198,14 +188,12 @@ public final class SimpleNormalizedNodeMessage { // required string xmlString = 2; public static final int XMLSTRING_FIELD_NUMBER = 2; private java.lang.Object xmlString_; - /** * required string xmlString = 2; */ public boolean hasXmlString() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** * required string xmlString = 2; */ @@ -223,15 +211,16 @@ public final class SimpleNormalizedNodeMessage { return s; } } - /** * required string xmlString = 2; */ - public com.google.protobuf.ByteString getXmlStringBytes() { + public com.google.protobuf.ByteString + getXmlStringBytes() { java.lang.Object ref = xmlString_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); xmlString_ = b; return b; } else { @@ -243,13 +232,10 @@ public final class SimpleNormalizedNodeMessage { nodeIdentifier_ = ""; xmlString_ = ""; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasNodeIdentifier()) { memoizedIsInitialized = 0; @@ -264,7 +250,7 @@ public final class SimpleNormalizedNodeMessage { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBytes(1, getNodeIdentifierBytes()); @@ -276,22 +262,18 @@ public final class SimpleNormalizedNodeMessage { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getNodeIdentifierBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getNodeIdentifierBytes()); } if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(2, - getXmlStringBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, getXmlStringBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -299,89 +281,71 @@ public final class SimpleNormalizedNodeMessage { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( + public static org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -389,41 +353,38 @@ public final class SimpleNormalizedNodeMessage { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.NormalizedNodeXml} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; + implements org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.class, - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder.class); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.class, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -441,28 +402,25 @@ public final class SimpleNormalizedNodeMessage { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; } - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml build() { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml build() { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml buildPartial() { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml result = - new org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml( - this); + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml buildPartial() { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml result = new org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -479,19 +437,16 @@ public final class SimpleNormalizedNodeMessage { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml other) { - if (other == org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml other) { + if (other == org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance()) return this; if (other.hasNodeIdentifier()) { bitField0_ |= 0x00000001; nodeIdentifier_ = other.nodeIdentifier_; @@ -518,17 +473,15 @@ public final class SimpleNormalizedNodeMessage { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -537,63 +490,59 @@ public final class SimpleNormalizedNodeMessage { } return this; } - private int bitField0_; // required string nodeIdentifier = 1; private java.lang.Object nodeIdentifier_ = ""; - /** * required string nodeIdentifier = 1; */ public boolean hasNodeIdentifier() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string nodeIdentifier = 1; */ public java.lang.String getNodeIdentifier() { java.lang.Object ref = nodeIdentifier_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); nodeIdentifier_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string nodeIdentifier = 1; */ - public com.google.protobuf.ByteString getNodeIdentifierBytes() { + public com.google.protobuf.ByteString + getNodeIdentifierBytes() { java.lang.Object ref = nodeIdentifier_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); nodeIdentifier_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string nodeIdentifier = 1; */ - public Builder setNodeIdentifier(java.lang.String value) { + public Builder setNodeIdentifier( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; nodeIdentifier_ = value; onChanged(); return this; } - /** * required string nodeIdentifier = 1; */ @@ -603,15 +552,15 @@ public final class SimpleNormalizedNodeMessage { onChanged(); return this; } - /** * required string nodeIdentifier = 1; */ - public Builder setNodeIdentifierBytes(com.google.protobuf.ByteString value) { + public Builder setNodeIdentifierBytes( + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; nodeIdentifier_ = value; onChanged(); return this; @@ -619,58 +568,55 @@ public final class SimpleNormalizedNodeMessage { // required string xmlString = 2; private java.lang.Object xmlString_ = ""; - /** * required string xmlString = 2; */ public boolean hasXmlString() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** * required string xmlString = 2; */ public java.lang.String getXmlString() { java.lang.Object ref = xmlString_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); xmlString_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string xmlString = 2; */ - public com.google.protobuf.ByteString getXmlStringBytes() { + public com.google.protobuf.ByteString + getXmlStringBytes() { java.lang.Object ref = xmlString_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); xmlString_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string xmlString = 2; */ - public Builder setXmlString(java.lang.String value) { + public Builder setXmlString( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; xmlString_ = value; onChanged(); return this; } - /** * required string xmlString = 2; */ @@ -680,15 +626,15 @@ public final class SimpleNormalizedNodeMessage { onChanged(); return this; } - /** * required string xmlString = 2; */ - public Builder setXmlStringBytes(com.google.protobuf.ByteString value) { + public Builder setXmlStringBytes( + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; xmlString_ = value; onChanged(); return this; @@ -705,38 +651,45 @@ public final class SimpleNormalizedNodeMessage { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.NormalizedNodeXml) } - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { - java.lang.String[] descriptorData = - {"\n\032SimpleNormalizedNode.proto\022!org.openda" - + "ylight.controller.mdsal\">\n\021NormalizedNod" - + "eXml\022\026\n\016nodeIdentifier\030\001 \002(\t\022\021\n\txmlStrin" - + "g\030\002 \002(\tBS\n4org.opendaylight.controller.c" - + "luster.datastore.commonB\033SimpleNormalize" + "dNodeMessage"}; + java.lang.String[] descriptorData = { + "\n\032SimpleNormalizedNode.proto\022!org.openda" + + "ylight.controller.mdsal\">\n\021NormalizedNod" + + "eXml\022\026\n\016nodeIdentifier\030\001 \002(\t\022\021\n\txmlStrin" + + "g\030\002 \002(\tBT\n5org.opendaylight.controller.p" + + "rotobuff.messages.commonB\033SimpleNormaliz" + + "edNodeMessage" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor, - new java.lang.String[] {"NodeIdentifier", "XmlString",}); - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_NormalizedNodeXml_descriptor, + new java.lang.String[] { "NodeIdentifier", "XmlString", }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{}, assigner); + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); } // @@protoc_insertion_point(outer_class_scope) diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/datachange/notification/DataChangeListenerMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java similarity index 50% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/datachange/notification/DataChangeListenerMessages.java rename to opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java index 5e9e454006..391107e2b7 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/datachange/notification/DataChangeListenerMessages.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/datachange/notification/DataChangeListenerMessages.java @@ -1,73 +1,64 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: DataChangeListener.proto -package org.opendaylight.controller.cluster.datastore.datachange.notification; +package org.opendaylight.controller.protobuff.messages.datachange.notification; public final class DataChangeListenerMessages { private DataChangeListenerMessages() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface DataChangedOrBuilder extends - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.ExtensionRegistry registry) { + } + public interface DataChangedOrBuilder + extends com.google.protobuf.MessageOrBuilder { // repeated string instanceIdentifierPathArguments = 1; /** * repeated string instanceIdentifierPathArguments = 1; */ - java.util.List getInstanceIdentifierPathArgumentsList(); - + java.util.List + getInstanceIdentifierPathArgumentsList(); /** * repeated string instanceIdentifierPathArguments = 1; */ int getInstanceIdentifierPathArgumentsCount(); - /** * repeated string instanceIdentifierPathArguments = 1; */ java.lang.String getInstanceIdentifierPathArguments(int index); - /** * repeated string instanceIdentifierPathArguments = 1; */ - com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index); + com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index); // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ boolean hasNormalizedNodeXml(); - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml(); - + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml(); /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.DataChanged} */ public static final class DataChanged extends - com.google.protobuf.GeneratedMessage implements DataChangedOrBuilder { + com.google.protobuf.GeneratedMessage + implements DataChangedOrBuilder { // Use DataChanged.newBuilder() to construct. private DataChanged(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private DataChanged(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private DataChanged(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final DataChanged defaultInstance; - public static DataChanged getDefaultInstance() { return defaultInstance; } @@ -77,13 +68,13 @@ public final class DataChangeListenerMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private DataChanged(com.google.protobuf.CodedInputStream input, + private DataChanged( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -99,32 +90,26 @@ public final class DataChangeListenerMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList(); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } instanceIdentifierPathArguments_.add(input.readBytes()); break; } case 18: { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = - null; + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = normalizedNodeXml_.toBuilder(); } - normalizedNodeXml_ = - input - .readMessage( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, - extensionRegistry); + normalizedNodeXml_ = input.readMessage(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(normalizedNodeXml_); normalizedNodeXml_ = subBuilder.buildPartial(); @@ -141,35 +126,33 @@ public final class DataChangeListenerMessages { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList(instanceIdentifierPathArguments_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged.class, - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged.Builder.class); + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.class, org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DataChanged parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DataChanged(input, extensionRegistry); - } - }; + public DataChanged parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DataChanged(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -180,75 +163,63 @@ public final class DataChangeListenerMessages { // repeated string instanceIdentifierPathArguments = 1; public static final int INSTANCEIDENTIFIERPATHARGUMENTS_FIELD_NUMBER = 1; private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_; - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { + public java.util.List + getInstanceIdentifierPathArgumentsList() { return instanceIdentifierPathArguments_; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; public static final int NORMALIZEDNODEXML_FIELD_NUMBER = 2; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNodeXml_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNodeXml_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ public boolean hasNormalizedNodeXml() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml() { return normalizedNodeXml_; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder() { return normalizedNodeXml_; } private void initFields() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - normalizedNodeXml_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; + normalizedNodeXml_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasNormalizedNodeXml()) { memoizedIsInitialized = 0; @@ -263,7 +234,7 @@ public final class DataChangeListenerMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { output.writeBytes(1, instanceIdentifierPathArguments_.getByteString(i)); @@ -275,28 +246,23 @@ public final class DataChangeListenerMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; { int dataSize = 0; for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { - dataSize += - com.google.protobuf.CodedOutputStream - .computeBytesSizeNoTag(instanceIdentifierPathArguments_ - .getByteString(i)); + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(instanceIdentifierPathArguments_.getByteString(i)); } size += dataSize; size += 1 * getInstanceIdentifierPathArgumentsList().size(); } if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeMessageSize(2, - normalizedNodeXml_); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, normalizedNodeXml_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -304,89 +270,71 @@ public final class DataChangeListenerMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -394,55 +342,49 @@ public final class DataChangeListenerMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.DataChanged} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; + implements org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged.class, - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged.Builder.class); + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.class, org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getNormalizedNodeXmlFieldBuilder(); } } - private static Builder create() { return new Builder(); } public Builder clear() { super.clear(); - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); if (normalizedNodeXmlBuilder_ == null) { - normalizedNodeXml_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNodeXml_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } else { normalizedNodeXmlBuilder_.clear(); } @@ -454,38 +396,33 @@ public final class DataChangeListenerMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged build() { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged build() { + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged buildPartial() { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged result = - new org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged( - this); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged buildPartial() { + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged result = new org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList( + instanceIdentifierPathArguments_); bitField0_ = (bitField0_ & ~0x00000001); } - result.instanceIdentifierPathArguments_ = - instanceIdentifierPathArguments_; + result.instanceIdentifierPathArguments_ = instanceIdentifierPathArguments_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000001; } @@ -500,28 +437,23 @@ public final class DataChangeListenerMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged other) { - if (other == org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged other) { + if (other == org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged.getDefaultInstance()) return this; if (!other.instanceIdentifierPathArguments_.isEmpty()) { if (instanceIdentifierPathArguments_.isEmpty()) { - instanceIdentifierPathArguments_ = - other.instanceIdentifierPathArguments_; + instanceIdentifierPathArguments_ = other.instanceIdentifierPathArguments_; bitField0_ = (bitField0_ & ~0x00000001); } else { ensureInstanceIdentifierPathArgumentsIsMutable(); - instanceIdentifierPathArguments_ - .addAll(other.instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_.addAll(other.instanceIdentifierPathArguments_); } onChanged(); } @@ -544,17 +476,15 @@ public final class DataChangeListenerMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChanged) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChanged) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -563,79 +493,68 @@ public final class DataChangeListenerMessages { } return this; } - private int bitField0_; // repeated string instanceIdentifierPathArguments = 1; - private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - + private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInstanceIdentifierPathArgumentsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(instanceIdentifierPathArguments_); bitField0_ |= 0x00000001; - } + } } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { - return java.util.Collections - .unmodifiableList(instanceIdentifierPathArguments_); + public java.util.List + getInstanceIdentifierPathArgumentsList() { + return java.util.Collections.unmodifiableList(instanceIdentifierPathArguments_); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder setInstanceIdentifierPathArguments(int index, - java.lang.String value) { + public Builder setInstanceIdentifierPathArguments( + int index, java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.set(index, value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder addInstanceIdentifierPathArguments(java.lang.String value) { + public Builder addInstanceIdentifierPathArguments( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ @@ -646,61 +565,53 @@ public final class DataChangeListenerMessages { onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder clearInstanceIdentifierPathArguments() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder addInstanceIdentifierPathArgumentsBytes( com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; } // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNodeXml_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder normalizedNodeXmlBuilder_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNodeXml_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> normalizedNodeXmlBuilder_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ public boolean hasNormalizedNodeXml() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNodeXml() { if (normalizedNodeXmlBuilder_ == null) { return normalizedNodeXml_; } else { return normalizedNodeXmlBuilder_.getMessage(); } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public Builder setNormalizedNodeXml( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder setNormalizedNodeXml(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeXmlBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -713,12 +624,11 @@ public final class DataChangeListenerMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ public Builder setNormalizedNodeXml( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { if (normalizedNodeXmlBuilder_ == null) { normalizedNodeXml_ = builderForValue.build(); onChanged(); @@ -728,20 +638,15 @@ public final class DataChangeListenerMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public Builder mergeNormalizedNodeXml( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder mergeNormalizedNodeXml(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeXmlBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) - && normalizedNodeXml_ != org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance()) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + normalizedNodeXml_ != org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance()) { normalizedNodeXml_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .newBuilder(normalizedNodeXml_).mergeFrom(value) - .buildPartial(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.newBuilder(normalizedNodeXml_).mergeFrom(value).buildPartial(); } else { normalizedNodeXml_ = value; } @@ -752,15 +657,12 @@ public final class DataChangeListenerMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ public Builder clearNormalizedNodeXml() { if (normalizedNodeXmlBuilder_ == null) { - normalizedNodeXml_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNodeXml_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); onChanged(); } else { normalizedNodeXmlBuilder_.clear(); @@ -768,35 +670,36 @@ public final class DataChangeListenerMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeXmlBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeXmlBuilder() { bitField0_ |= 0x00000002; onChanged(); return getNormalizedNodeXmlFieldBuilder().getBuilder(); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeXmlOrBuilder() { if (normalizedNodeXmlBuilder_ != null) { return normalizedNodeXmlBuilder_.getMessageOrBuilder(); } else { return normalizedNodeXml_; } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNodeXml = 2; */ - private com.google.protobuf.SingleFieldBuilder getNormalizedNodeXmlFieldBuilder() { + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> + getNormalizedNodeXmlFieldBuilder() { if (normalizedNodeXmlBuilder_ == null) { - normalizedNodeXmlBuilder_ = - new com.google.protobuf.SingleFieldBuilder( - normalizedNodeXml_, getParentForChildren(), isClean()); + normalizedNodeXmlBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder>( + normalizedNodeXml_, + getParentForChildren(), + isClean()); normalizedNodeXml_ = null; } return normalizedNodeXmlBuilder_; @@ -813,28 +716,23 @@ public final class DataChangeListenerMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.DataChanged) } - public interface DataChangedReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface DataChangedReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.DataChangedReply} */ public static final class DataChangedReply extends - com.google.protobuf.GeneratedMessage implements DataChangedReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements DataChangedReplyOrBuilder { // Use DataChangedReply.newBuilder() to construct. - private DataChangedReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private DataChangedReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private DataChangedReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private DataChangedReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final DataChangedReply defaultInstance; - public static DataChangedReply getDefaultInstance() { return defaultInstance; } @@ -844,13 +742,13 @@ public final class DataChangeListenerMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private DataChangedReply(com.google.protobuf.CodedInputStream input, + private DataChangedReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -865,8 +763,8 @@ public final class DataChangeListenerMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -883,58 +781,54 @@ public final class DataChangeListenerMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply.class, - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply.Builder.class); + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.class, org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DataChangedReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DataChangedReply(input, extensionRegistry); - } - }; + public DataChangedReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DataChangedReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -943,89 +837,71 @@ public final class DataChangeListenerMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -1033,41 +909,38 @@ public final class DataChangeListenerMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.DataChangedReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply.class, - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply.Builder.class); + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.class, org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -1081,46 +954,40 @@ public final class DataChangeListenerMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply build() { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply build() { + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply buildPartial() { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply result = - new org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply( - this); + public org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply buildPartial() { + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply result = new org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply other) { - if (other == org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply other) { + if (other == org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1129,17 +996,15 @@ public final class DataChangeListenerMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.datachange.notification.DataChangeListenerMessages.DataChangedReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.datachange.notification.DataChangeListenerMessages.DataChangedReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1160,53 +1025,60 @@ public final class DataChangeListenerMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.DataChangedReply) } - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { - java.lang.String[] descriptorData = - {"\n\030DataChangeListener.proto\022!org.opendayl" - + "ight.controller.mdsal\032\032SimpleNormalizedN" - + "ode.proto\"\207\001\n\013DataChanged\022\'\n\037instanceIde" - + "ntifierPathArguments\030\001 \003(\t\022O\n\021normalized" - + "NodeXml\030\002 \002(\01324.org.opendaylight.control" - + "ler.mdsal.NormalizedNodeXml\"\022\n\020DataChang" - + "edReplyBc\nEorg.opendaylight.controller.c" - + "luster.datastore.datachange.notification" - + "B\032DataChangeListenerMessages"}; + java.lang.String[] descriptorData = { + "\n\030DataChangeListener.proto\022!org.opendayl" + + "ight.controller.mdsal\032\032SimpleNormalizedN" + + "ode.proto\"\207\001\n\013DataChanged\022\'\n\037instanceIde" + + "ntifierPathArguments\030\001 \003(\t\022O\n\021normalized" + + "NodeXml\030\002 \002(\01324.org.opendaylight.control" + + "ler.mdsal.NormalizedNodeXml\"\022\n\020DataChang" + + "edReplyBd\nForg.opendaylight.controller.p" + + "rotobuff.messages.datachange.notificatio" + + "nB\032DataChangeListenerMessages" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor, - new java.lang.String[] {"InstanceIdentifierPathArguments", - "NormalizedNodeXml",}); - internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor, - new java.lang.String[] {}); - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_DataChanged_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_DataChanged_descriptor, + new java.lang.String[] { "InstanceIdentifierPathArguments", "NormalizedNodeXml", }); + internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_opendaylight_controller_mdsal_DataChangedReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_DataChangedReply_descriptor, + new java.lang.String[] { }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage - .getDescriptor(),}, assigner); + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.getDescriptor(), + }, assigner); } // @@protoc_insertion_point(outer_class_scope) diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java new file mode 100644 index 0000000000..a1906b8ba5 --- /dev/null +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/registration/ListenerRegistrationMessages.java @@ -0,0 +1,681 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ListenerRegistration.proto + +package org.opendaylight.controller.protobuff.messages.registration; + +public final class ListenerRegistrationMessages { + private ListenerRegistrationMessages() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + } + public interface CloseOrBuilder + extends com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.Close} + */ + public static final class Close extends + com.google.protobuf.GeneratedMessage + implements CloseOrBuilder { + // Use Close.newBuilder() to construct. + private Close(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Close(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Close defaultInstance; + public static Close getDefaultInstance() { + return defaultInstance; + } + + public Close getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Close( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.class, org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Close parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Close(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private void initFields() { + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.Close} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.class, org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_Close_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close build() { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close buildPartial() { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close result = new org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close(this); + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close other) { + if (other == org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.Close) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.Close) + } + + static { + defaultInstance = new Close(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.Close) + } + + public interface CloseReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseReply} + */ + public static final class CloseReply extends + com.google.protobuf.GeneratedMessage + implements CloseReplyOrBuilder { + // Use CloseReply.newBuilder() to construct. + private CloseReply(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CloseReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CloseReply defaultInstance; + public static CloseReply getDefaultInstance() { + return defaultInstance; + } + + public CloseReply getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CloseReply( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.class, org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CloseReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CloseReply(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private void initFields() { + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseReply} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.class, org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply build() { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply buildPartial() { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply result = new org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply(this); + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply other) { + if (other == org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.registration.ListenerRegistrationMessages.CloseReply) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseReply) + } + + static { + defaultInstance = new CloseReply(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseReply) + } + + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_Close_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\032ListenerRegistration.proto\022!org.openda" + + "ylight.controller.mdsal\"\007\n\005Close\"\014\n\nClos" + + "eReplyB[\n;org.opendaylight.controller.pr" + + "otobuff.messages.registrationB\034ListenerR" + + "egistrationMessages" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_Close_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_Close_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_Close_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_opendaylight_controller_mdsal_CloseReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CloseReply_descriptor, + new java.lang.String[] { }); + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/shard/ShardManagerMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java similarity index 51% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/shard/ShardManagerMessages.java rename to opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java index 3613923439..055f18e4d3 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/shard/ShardManagerMessages.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/shard/ShardManagerMessages.java @@ -1,51 +1,45 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: ShardManager.proto -package org.opendaylight.controller.cluster.datastore.shard; +package org.opendaylight.controller.protobuff.messages.shard; public final class ShardManagerMessages { private ShardManagerMessages() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface FindPrimaryOrBuilder extends - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.ExtensionRegistry registry) { + } + public interface FindPrimaryOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required string shardName = 1; /** * required string shardName = 1; */ boolean hasShardName(); - /** * required string shardName = 1; */ java.lang.String getShardName(); - /** * required string shardName = 1; */ - com.google.protobuf.ByteString getShardNameBytes(); + com.google.protobuf.ByteString + getShardNameBytes(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.FindPrimary} */ public static final class FindPrimary extends - com.google.protobuf.GeneratedMessage implements FindPrimaryOrBuilder { + com.google.protobuf.GeneratedMessage + implements FindPrimaryOrBuilder { // Use FindPrimary.newBuilder() to construct. private FindPrimary(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private FindPrimary(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private FindPrimary(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final FindPrimary defaultInstance; - public static FindPrimary getDefaultInstance() { return defaultInstance; } @@ -55,13 +49,13 @@ public final class ShardManagerMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private FindPrimary(com.google.protobuf.CodedInputStream input, + private FindPrimary( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -77,8 +71,8 @@ public final class ShardManagerMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -100,27 +94,27 @@ public final class ShardManagerMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public FindPrimary parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new FindPrimary(input, extensionRegistry); - } - }; + public FindPrimary parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new FindPrimary(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -131,14 +125,12 @@ public final class ShardManagerMessages { // required string shardName = 1; public static final int SHARDNAME_FIELD_NUMBER = 1; private java.lang.Object shardName_; - /** * required string shardName = 1; */ public boolean hasShardName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string shardName = 1; */ @@ -156,15 +148,16 @@ public final class ShardManagerMessages { return s; } } - /** * required string shardName = 1; */ - public com.google.protobuf.ByteString getShardNameBytes() { + public com.google.protobuf.ByteString + getShardNameBytes() { java.lang.Object ref = shardName_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); shardName_ = b; return b; } else { @@ -175,13 +168,10 @@ public final class ShardManagerMessages { private void initFields() { shardName_ = ""; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasShardName()) { memoizedIsInitialized = 0; @@ -192,7 +182,7 @@ public final class ShardManagerMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBytes(1, getShardNameBytes()); @@ -201,17 +191,14 @@ public final class ShardManagerMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getShardNameBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getShardNameBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -219,89 +206,71 @@ public final class ShardManagerMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -309,41 +278,38 @@ public final class ShardManagerMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.FindPrimary} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimaryOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; + implements org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimaryOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -359,28 +325,25 @@ public final class ShardManagerMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary build() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary build() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary buildPartial() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary result = - new org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary( - this); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary buildPartial() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary result = new org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -393,19 +356,16 @@ public final class ShardManagerMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary other) { - if (other == org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary other) { + if (other == org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary.getDefaultInstance()) return this; if (other.hasShardName()) { bitField0_ |= 0x00000001; shardName_ = other.shardName_; @@ -423,17 +383,15 @@ public final class ShardManagerMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.FindPrimary) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.FindPrimary) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -442,63 +400,59 @@ public final class ShardManagerMessages { } return this; } - private int bitField0_; // required string shardName = 1; private java.lang.Object shardName_ = ""; - /** * required string shardName = 1; */ public boolean hasShardName() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string shardName = 1; */ public java.lang.String getShardName() { java.lang.Object ref = shardName_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); shardName_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string shardName = 1; */ - public com.google.protobuf.ByteString getShardNameBytes() { + public com.google.protobuf.ByteString + getShardNameBytes() { java.lang.Object ref = shardName_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); shardName_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string shardName = 1; */ - public Builder setShardName(java.lang.String value) { + public Builder setShardName( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; shardName_ = value; onChanged(); return this; } - /** * required string shardName = 1; */ @@ -508,15 +462,15 @@ public final class ShardManagerMessages { onChanged(); return this; } - /** * required string shardName = 1; */ - public Builder setShardNameBytes(com.google.protobuf.ByteString value) { + public Builder setShardNameBytes( + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; shardName_ = value; onChanged(); return this; @@ -533,27 +487,23 @@ public final class ShardManagerMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.FindPrimary) } - public interface PrimaryFoundOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface PrimaryFoundOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.PrimaryFound} */ public static final class PrimaryFound extends - com.google.protobuf.GeneratedMessage implements PrimaryFoundOrBuilder { + com.google.protobuf.GeneratedMessage + implements PrimaryFoundOrBuilder { // Use PrimaryFound.newBuilder() to construct. private PrimaryFound(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private PrimaryFound(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private PrimaryFound(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final PrimaryFound defaultInstance; - public static PrimaryFound getDefaultInstance() { return defaultInstance; } @@ -563,13 +513,13 @@ public final class ShardManagerMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private PrimaryFound(com.google.protobuf.CodedInputStream input, + private PrimaryFound( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -584,8 +534,8 @@ public final class ShardManagerMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -602,58 +552,54 @@ public final class ShardManagerMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public PrimaryFound parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PrimaryFound(input, extensionRegistry); - } - }; + public PrimaryFound parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PrimaryFound(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -662,89 +608,71 @@ public final class ShardManagerMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -752,41 +680,38 @@ public final class ShardManagerMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.PrimaryFound} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFoundOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; + implements org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFoundOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -800,46 +725,40 @@ public final class ShardManagerMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound build() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound build() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound buildPartial() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound result = - new org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound( - this); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound buildPartial() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound result = new org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound other) { - if (other == org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound other) { + if (other == org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -848,17 +767,15 @@ public final class ShardManagerMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryFound) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryFound) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -879,28 +796,23 @@ public final class ShardManagerMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.PrimaryFound) } - public interface PrimaryNotFoundOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface PrimaryNotFoundOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.PrimaryNotFound} */ public static final class PrimaryNotFound extends - com.google.protobuf.GeneratedMessage implements PrimaryNotFoundOrBuilder { + com.google.protobuf.GeneratedMessage + implements PrimaryNotFoundOrBuilder { // Use PrimaryNotFound.newBuilder() to construct. - private PrimaryNotFound( - com.google.protobuf.GeneratedMessage.Builder builder) { + private PrimaryNotFound(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private PrimaryNotFound(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private PrimaryNotFound(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final PrimaryNotFound defaultInstance; - public static PrimaryNotFound getDefaultInstance() { return defaultInstance; } @@ -910,13 +822,13 @@ public final class ShardManagerMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private PrimaryNotFound(com.google.protobuf.CodedInputStream input, + private PrimaryNotFound( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -931,8 +843,8 @@ public final class ShardManagerMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -949,58 +861,54 @@ public final class ShardManagerMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public PrimaryNotFound parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PrimaryNotFound(input, extensionRegistry); - } - }; + public PrimaryNotFound parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PrimaryNotFound(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -1009,89 +917,71 @@ public final class ShardManagerMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parseFrom( + public static org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -1099,41 +989,38 @@ public final class ShardManagerMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.PrimaryNotFound} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFoundOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; + implements org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFoundOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound.class, - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound.Builder.class); + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.class, org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -1147,46 +1034,40 @@ public final class ShardManagerMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound build() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound build() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound buildPartial() { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound result = - new org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound( - this); + public org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound buildPartial() { + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound result = new org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound other) { - if (other == org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound other) { + if (other == org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1195,17 +1076,15 @@ public final class ShardManagerMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages.PrimaryNotFound) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages.PrimaryNotFound) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1226,54 +1105,67 @@ public final class ShardManagerMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.PrimaryNotFound) } - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { - java.lang.String[] descriptorData = - {"\n\022ShardManager.proto\022!org.opendaylight.c" - + "ontroller.mdsal\" \n\013FindPrimary\022\021\n\tshardN" - + "ame\030\001 \002(\t\"\016\n\014PrimaryFound\"\021\n\017PrimaryNotF" - + "oundBK\n3org.opendaylight.controller.clus" - + "ter.datastore.shardB\024ShardManagerMessage" + "s"}; + java.lang.String[] descriptorData = { + "\n\022ShardManager.proto\022!org.opendaylight.c" + + "ontroller.mdsal\" \n\013FindPrimary\022\021\n\tshardN" + + "ame\030\001 \002(\t\"\016\n\014PrimaryFound\"\021\n\017PrimaryNotF" + + "oundBL\n4org.opendaylight.controller.prot" + + "obuff.messages.shardB\024ShardManagerMessag" + + "es" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor, - new java.lang.String[] {"ShardName",}); - internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor, - new java.lang.String[] {}); - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_FindPrimary_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_FindPrimary_descriptor, + new java.lang.String[] { "ShardName", }); + internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_opendaylight_controller_mdsal_PrimaryFound_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_PrimaryFound_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_PrimaryNotFound_descriptor, + new java.lang.String[] { }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[]{}, assigner); + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); } // @@protoc_insertion_point(outer_class_scope) diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java new file mode 100644 index 0000000000..63dd5e7081 --- /dev/null +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionChainMessages.java @@ -0,0 +1,1494 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ShardTransactionChain.proto + +package org.opendaylight.controller.protobuff.messages.transaction; + +public final class ShardTransactionChainMessages { + private ShardTransactionChainMessages() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + } + public interface CloseTransactionChainOrBuilder + extends com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChain} + */ + public static final class CloseTransactionChain extends + com.google.protobuf.GeneratedMessage + implements CloseTransactionChainOrBuilder { + // Use CloseTransactionChain.newBuilder() to construct. + private CloseTransactionChain(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CloseTransactionChain(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CloseTransactionChain defaultInstance; + public static CloseTransactionChain getDefaultInstance() { + return defaultInstance; + } + + public CloseTransactionChain getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CloseTransactionChain( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CloseTransactionChain parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CloseTransactionChain(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private void initFields() { + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChain} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain(this); + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChain) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseTransactionChain) + } + + static { + defaultInstance = new CloseTransactionChain(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransactionChain) + } + + public interface CloseTransactionChainReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChainReply} + */ + public static final class CloseTransactionChainReply extends + com.google.protobuf.GeneratedMessage + implements CloseTransactionChainReplyOrBuilder { + // Use CloseTransactionChainReply.newBuilder() to construct. + private CloseTransactionChainReply(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CloseTransactionChainReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CloseTransactionChainReply defaultInstance; + public static CloseTransactionChainReply getDefaultInstance() { + return defaultInstance; + } + + public CloseTransactionChainReply getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CloseTransactionChainReply( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CloseTransactionChainReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CloseTransactionChainReply(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private void initFields() { + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionChainReply} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply(this); + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CloseTransactionChainReply) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CloseTransactionChainReply) + } + + static { + defaultInstance = new CloseTransactionChainReply(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransactionChainReply) + } + + public interface CreateTransactionChainOrBuilder + extends com.google.protobuf.MessageOrBuilder { + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChain} + */ + public static final class CreateTransactionChain extends + com.google.protobuf.GeneratedMessage + implements CreateTransactionChainOrBuilder { + // Use CreateTransactionChain.newBuilder() to construct. + private CreateTransactionChain(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CreateTransactionChain(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CreateTransactionChain defaultInstance; + public static CreateTransactionChain getDefaultInstance() { + return defaultInstance; + } + + public CreateTransactionChain getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CreateTransactionChain( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CreateTransactionChain parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CreateTransactionChain(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private void initFields() { + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChain} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain(this); + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain.getDefaultInstance()) return this; + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChain) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CreateTransactionChain) + } + + static { + defaultInstance = new CreateTransactionChain(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransactionChain) + } + + public interface CreateTransactionChainReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required string transactionChainPath = 1; + /** + * required string transactionChainPath = 1; + */ + boolean hasTransactionChainPath(); + /** + * required string transactionChainPath = 1; + */ + java.lang.String getTransactionChainPath(); + /** + * required string transactionChainPath = 1; + */ + com.google.protobuf.ByteString + getTransactionChainPathBytes(); + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChainReply} + */ + public static final class CreateTransactionChainReply extends + com.google.protobuf.GeneratedMessage + implements CreateTransactionChainReplyOrBuilder { + // Use CreateTransactionChainReply.newBuilder() to construct. + private CreateTransactionChainReply(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private CreateTransactionChainReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final CreateTransactionChainReply defaultInstance; + public static CreateTransactionChainReply getDefaultInstance() { + return defaultInstance; + } + + public CreateTransactionChainReply getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private CreateTransactionChainReply( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + bitField0_ |= 0x00000001; + transactionChainPath_ = input.readBytes(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public CreateTransactionChainReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CreateTransactionChainReply(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // required string transactionChainPath = 1; + public static final int TRANSACTIONCHAINPATH_FIELD_NUMBER = 1; + private java.lang.Object transactionChainPath_; + /** + * required string transactionChainPath = 1; + */ + public boolean hasTransactionChainPath() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required string transactionChainPath = 1; + */ + public java.lang.String getTransactionChainPath() { + java.lang.Object ref = transactionChainPath_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + transactionChainPath_ = s; + } + return s; + } + } + /** + * required string transactionChainPath = 1; + */ + public com.google.protobuf.ByteString + getTransactionChainPathBytes() { + java.lang.Object ref = transactionChainPath_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + transactionChainPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + private void initFields() { + transactionChainPath_ = ""; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasTransactionChainPath()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeBytes(1, getTransactionChainPathBytes()); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getTransactionChainPathBytes()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionChainReply} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.Builder.class); + } + + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + transactionChainPath_ = ""; + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.getDefaultInstance(); + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.transactionChainPath_ = transactionChainPath_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply.getDefaultInstance()) return this; + if (other.hasTransactionChainPath()) { + bitField0_ |= 0x00000001; + transactionChainPath_ = other.transactionChainPath_; + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasTransactionChainPath()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionChainMessages.CreateTransactionChainReply) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required string transactionChainPath = 1; + private java.lang.Object transactionChainPath_ = ""; + /** + * required string transactionChainPath = 1; + */ + public boolean hasTransactionChainPath() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required string transactionChainPath = 1; + */ + public java.lang.String getTransactionChainPath() { + java.lang.Object ref = transactionChainPath_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + transactionChainPath_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * required string transactionChainPath = 1; + */ + public com.google.protobuf.ByteString + getTransactionChainPathBytes() { + java.lang.Object ref = transactionChainPath_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + transactionChainPath_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * required string transactionChainPath = 1; + */ + public Builder setTransactionChainPath( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + transactionChainPath_ = value; + onChanged(); + return this; + } + /** + * required string transactionChainPath = 1; + */ + public Builder clearTransactionChainPath() { + bitField0_ = (bitField0_ & ~0x00000001); + transactionChainPath_ = getDefaultInstance().getTransactionChainPath(); + onChanged(); + return this; + } + /** + * required string transactionChainPath = 1; + */ + public Builder setTransactionChainPathBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + transactionChainPath_ = value; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.opendaylight.controller.mdsal.CreateTransactionChainReply) + } + + static { + defaultInstance = new CreateTransactionChainReply(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransactionChainReply) + } + + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n\033ShardTransactionChain.proto\022!org.opend" + + "aylight.controller.mdsal\"\027\n\025CloseTransac" + + "tionChain\"\034\n\032CloseTransactionChainReply\"" + + "\030\n\026CreateTransactionChain\";\n\033CreateTrans" + + "actionChainReply\022\034\n\024transactionChainPath" + + "\030\001 \002(\tB[\n:org.opendaylight.controller.pr" + + "otobuff.messages.transactionB\035ShardTrans" + + "actionChainMessages" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChain_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CloseTransactionChainReply_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChain_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CreateTransactionChainReply_descriptor, + new java.lang.String[] { "TransactionChainPath", }); + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionMessages.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java similarity index 51% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionMessages.java rename to opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java index 2ade1d6a60..cabcf859da 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/cluster/datastore/transaction/ShardTransactionMessages.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/java/org/opendaylight/controller/protobuff/messages/transaction/ShardTransactionMessages.java @@ -1,36 +1,30 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! +// Generated by the protocol buffer compiler. DO NOT EDIT! // source: ShardTransaction.proto -package org.opendaylight.controller.cluster.datastore.transaction; +package org.opendaylight.controller.protobuff.messages.transaction; public final class ShardTransactionMessages { private ShardTransactionMessages() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) {} - - public interface CloseTransactionOrBuilder extends - com.google.protobuf.MessageOrBuilder { + com.google.protobuf.ExtensionRegistry registry) { + } + public interface CloseTransactionOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransaction} */ public static final class CloseTransaction extends - com.google.protobuf.GeneratedMessage implements CloseTransactionOrBuilder { + com.google.protobuf.GeneratedMessage + implements CloseTransactionOrBuilder { // Use CloseTransaction.newBuilder() to construct. - private CloseTransaction( - com.google.protobuf.GeneratedMessage.Builder builder) { + private CloseTransaction(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private CloseTransaction(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private CloseTransaction(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final CloseTransaction defaultInstance; - public static CloseTransaction getDefaultInstance() { return defaultInstance; } @@ -40,13 +34,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private CloseTransaction(com.google.protobuf.CodedInputStream input, + private CloseTransaction( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -61,8 +55,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -79,58 +73,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CloseTransaction parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseTransaction(input, extensionRegistry); - } - }; + public CloseTransaction parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CloseTransaction(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -139,89 +129,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -229,41 +201,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransaction} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -277,46 +246,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -325,17 +288,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransaction) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransaction) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -356,29 +317,23 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransaction) } - public interface CloseTransactionReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface CloseTransactionReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionReply} */ public static final class CloseTransactionReply extends - com.google.protobuf.GeneratedMessage implements - CloseTransactionReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements CloseTransactionReplyOrBuilder { // Use CloseTransactionReply.newBuilder() to construct. - private CloseTransactionReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private CloseTransactionReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private CloseTransactionReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private CloseTransactionReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final CloseTransactionReply defaultInstance; - public static CloseTransactionReply getDefaultInstance() { return defaultInstance; } @@ -388,13 +343,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private CloseTransactionReply(com.google.protobuf.CodedInputStream input, + private CloseTransactionReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -409,8 +364,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -427,58 +382,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CloseTransactionReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CloseTransactionReply(input, extensionRegistry); - } - }; + public CloseTransactionReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CloseTransactionReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -487,89 +438,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -577,41 +510,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.CloseTransactionReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -625,46 +555,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -673,17 +597,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CloseTransactionReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CloseTransactionReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -704,29 +626,23 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CloseTransactionReply) } - public interface CreateTransactionOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface CreateTransactionOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransaction} */ public static final class CreateTransaction extends - com.google.protobuf.GeneratedMessage implements - CreateTransactionOrBuilder { + com.google.protobuf.GeneratedMessage + implements CreateTransactionOrBuilder { // Use CreateTransaction.newBuilder() to construct. - private CreateTransaction( - com.google.protobuf.GeneratedMessage.Builder builder) { + private CreateTransaction(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private CreateTransaction(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private CreateTransaction(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final CreateTransaction defaultInstance; - public static CreateTransaction getDefaultInstance() { return defaultInstance; } @@ -736,13 +652,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private CreateTransaction(com.google.protobuf.CodedInputStream input, + private CreateTransaction( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -757,8 +673,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -775,58 +691,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CreateTransaction parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateTransaction(input, extensionRegistry); - } - }; + public CreateTransaction parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CreateTransaction(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -835,89 +747,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -925,41 +819,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransaction} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -973,46 +864,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1021,17 +906,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransaction) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransaction) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1052,45 +935,38 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransaction) } - public interface CreateTransactionReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface CreateTransactionReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required string transactionPath = 1; /** * required string transactionPath = 1; */ boolean hasTransactionPath(); - /** * required string transactionPath = 1; */ java.lang.String getTransactionPath(); - /** * required string transactionPath = 1; */ - com.google.protobuf.ByteString getTransactionPathBytes(); + com.google.protobuf.ByteString + getTransactionPathBytes(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionReply} */ public static final class CreateTransactionReply extends - com.google.protobuf.GeneratedMessage implements - CreateTransactionReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements CreateTransactionReplyOrBuilder { // Use CreateTransactionReply.newBuilder() to construct. - private CreateTransactionReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private CreateTransactionReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private CreateTransactionReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private CreateTransactionReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final CreateTransactionReply defaultInstance; - public static CreateTransactionReply getDefaultInstance() { return defaultInstance; } @@ -1100,13 +976,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private CreateTransactionReply(com.google.protobuf.CodedInputStream input, + private CreateTransactionReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -1122,8 +998,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -1145,27 +1021,27 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public CreateTransactionReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new CreateTransactionReply(input, extensionRegistry); - } - }; + public CreateTransactionReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new CreateTransactionReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -1176,14 +1052,12 @@ public final class ShardTransactionMessages { // required string transactionPath = 1; public static final int TRANSACTIONPATH_FIELD_NUMBER = 1; private java.lang.Object transactionPath_; - /** * required string transactionPath = 1; */ public boolean hasTransactionPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string transactionPath = 1; */ @@ -1201,15 +1075,16 @@ public final class ShardTransactionMessages { return s; } } - /** * required string transactionPath = 1; */ - public com.google.protobuf.ByteString getTransactionPathBytes() { + public com.google.protobuf.ByteString + getTransactionPathBytes() { java.lang.Object ref = transactionPath_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); transactionPath_ = b; return b; } else { @@ -1220,13 +1095,10 @@ public final class ShardTransactionMessages { private void initFields() { transactionPath_ = ""; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasTransactionPath()) { memoizedIsInitialized = 0; @@ -1237,7 +1109,7 @@ public final class ShardTransactionMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBytes(1, getTransactionPathBytes()); @@ -1246,17 +1118,14 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getTransactionPathBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getTransactionPathBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -1264,89 +1133,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -1354,41 +1205,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.CreateTransactionReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -1404,28 +1252,25 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -1438,19 +1283,16 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply.getDefaultInstance()) return this; if (other.hasTransactionPath()) { bitField0_ |= 0x00000001; transactionPath_ = other.transactionPath_; @@ -1468,17 +1310,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.CreateTransactionReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.CreateTransactionReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1487,63 +1327,59 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // required string transactionPath = 1; private java.lang.Object transactionPath_ = ""; - /** * required string transactionPath = 1; */ public boolean hasTransactionPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string transactionPath = 1; */ public java.lang.String getTransactionPath() { java.lang.Object ref = transactionPath_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); transactionPath_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string transactionPath = 1; */ - public com.google.protobuf.ByteString getTransactionPathBytes() { + public com.google.protobuf.ByteString + getTransactionPathBytes() { java.lang.Object ref = transactionPath_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); transactionPath_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string transactionPath = 1; */ - public Builder setTransactionPath(java.lang.String value) { + public Builder setTransactionPath( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; transactionPath_ = value; onChanged(); return this; } - /** * required string transactionPath = 1; */ @@ -1553,16 +1389,15 @@ public final class ShardTransactionMessages { onChanged(); return this; } - /** * required string transactionPath = 1; */ public Builder setTransactionPathBytes( com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; transactionPath_ = value; onChanged(); return this; @@ -1579,28 +1414,23 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.CreateTransactionReply) } - public interface ReadyTransactionOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface ReadyTransactionOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadyTransaction} */ public static final class ReadyTransaction extends - com.google.protobuf.GeneratedMessage implements ReadyTransactionOrBuilder { + com.google.protobuf.GeneratedMessage + implements ReadyTransactionOrBuilder { // Use ReadyTransaction.newBuilder() to construct. - private ReadyTransaction( - com.google.protobuf.GeneratedMessage.Builder builder) { + private ReadyTransaction(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private ReadyTransaction(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private ReadyTransaction(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final ReadyTransaction defaultInstance; - public static ReadyTransaction getDefaultInstance() { return defaultInstance; } @@ -1610,13 +1440,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private ReadyTransaction(com.google.protobuf.CodedInputStream input, + private ReadyTransaction( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -1631,8 +1461,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -1649,58 +1479,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ReadyTransaction parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadyTransaction(input, extensionRegistry); - } - }; + public ReadyTransaction parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadyTransaction(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -1709,89 +1535,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -1799,41 +1607,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadyTransaction} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -1847,46 +1652,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -1895,17 +1694,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransaction) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransaction) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -1926,45 +1723,38 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.ReadyTransaction) } - public interface ReadyTransactionReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface ReadyTransactionReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required string actorPath = 1; /** * required string actorPath = 1; */ boolean hasActorPath(); - /** * required string actorPath = 1; */ java.lang.String getActorPath(); - /** * required string actorPath = 1; */ - com.google.protobuf.ByteString getActorPathBytes(); + com.google.protobuf.ByteString + getActorPathBytes(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadyTransactionReply} */ public static final class ReadyTransactionReply extends - com.google.protobuf.GeneratedMessage implements - ReadyTransactionReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements ReadyTransactionReplyOrBuilder { // Use ReadyTransactionReply.newBuilder() to construct. - private ReadyTransactionReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private ReadyTransactionReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private ReadyTransactionReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private ReadyTransactionReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final ReadyTransactionReply defaultInstance; - public static ReadyTransactionReply getDefaultInstance() { return defaultInstance; } @@ -1974,13 +1764,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private ReadyTransactionReply(com.google.protobuf.CodedInputStream input, + private ReadyTransactionReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -1996,8 +1786,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -2019,27 +1809,27 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ReadyTransactionReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadyTransactionReply(input, extensionRegistry); - } - }; + public ReadyTransactionReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadyTransactionReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -2050,14 +1840,12 @@ public final class ShardTransactionMessages { // required string actorPath = 1; public static final int ACTORPATH_FIELD_NUMBER = 1; private java.lang.Object actorPath_; - /** * required string actorPath = 1; */ public boolean hasActorPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string actorPath = 1; */ @@ -2075,15 +1863,16 @@ public final class ShardTransactionMessages { return s; } } - /** * required string actorPath = 1; */ - public com.google.protobuf.ByteString getActorPathBytes() { + public com.google.protobuf.ByteString + getActorPathBytes() { java.lang.Object ref = actorPath_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); actorPath_ = b; return b; } else { @@ -2094,13 +1883,10 @@ public final class ShardTransactionMessages { private void initFields() { actorPath_ = ""; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasActorPath()) { memoizedIsInitialized = 0; @@ -2111,7 +1897,7 @@ public final class ShardTransactionMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBytes(1, getActorPathBytes()); @@ -2120,17 +1906,14 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getActorPathBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getActorPathBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -2138,89 +1921,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -2228,41 +1993,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadyTransactionReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -2278,28 +2040,25 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -2312,19 +2071,16 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply.getDefaultInstance()) return this; if (other.hasActorPath()) { bitField0_ |= 0x00000001; actorPath_ = other.actorPath_; @@ -2342,17 +2098,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadyTransactionReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadyTransactionReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2361,63 +2115,59 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // required string actorPath = 1; private java.lang.Object actorPath_ = ""; - /** * required string actorPath = 1; */ public boolean hasActorPath() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string actorPath = 1; */ public java.lang.String getActorPath() { java.lang.Object ref = actorPath_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); actorPath_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string actorPath = 1; */ - public com.google.protobuf.ByteString getActorPathBytes() { + public com.google.protobuf.ByteString + getActorPathBytes() { java.lang.Object ref = actorPath_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); actorPath_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string actorPath = 1; */ - public Builder setActorPath(java.lang.String value) { + public Builder setActorPath( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; actorPath_ = value; onChanged(); return this; } - /** * required string actorPath = 1; */ @@ -2427,15 +2177,15 @@ public final class ShardTransactionMessages { onChanged(); return this; } - /** * required string actorPath = 1; */ - public Builder setActorPathBytes(com.google.protobuf.ByteString value) { + public Builder setActorPathBytes( + com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; actorPath_ = value; onChanged(); return this; @@ -2452,49 +2202,43 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.ReadyTransactionReply) } - public interface DeleteDataOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface DeleteDataOrBuilder + extends com.google.protobuf.MessageOrBuilder { // repeated string instanceIdentifierPathArguments = 1; /** * repeated string instanceIdentifierPathArguments = 1; */ - java.util.List getInstanceIdentifierPathArgumentsList(); - + java.util.List + getInstanceIdentifierPathArgumentsList(); /** * repeated string instanceIdentifierPathArguments = 1; */ int getInstanceIdentifierPathArgumentsCount(); - /** * repeated string instanceIdentifierPathArguments = 1; */ java.lang.String getInstanceIdentifierPathArguments(int index); - /** * repeated string instanceIdentifierPathArguments = 1; */ - com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index); + com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.DeleteData} */ public static final class DeleteData extends - com.google.protobuf.GeneratedMessage implements DeleteDataOrBuilder { + com.google.protobuf.GeneratedMessage + implements DeleteDataOrBuilder { // Use DeleteData.newBuilder() to construct. private DeleteData(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private DeleteData(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private DeleteData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final DeleteData defaultInstance; - public static DeleteData getDefaultInstance() { return defaultInstance; } @@ -2504,13 +2248,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private DeleteData(com.google.protobuf.CodedInputStream input, + private DeleteData( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -2526,16 +2270,15 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList(); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } instanceIdentifierPathArguments_.add(input.readBytes()); @@ -2550,35 +2293,33 @@ public final class ShardTransactionMessages { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList(instanceIdentifierPathArguments_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DeleteData parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DeleteData(input, extensionRegistry); - } - }; + public DeleteData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteData(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -2588,54 +2329,47 @@ public final class ShardTransactionMessages { // repeated string instanceIdentifierPathArguments = 1; public static final int INSTANCEIDENTIFIERPATHARGUMENTS_FIELD_NUMBER = 1; private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_; - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { + public java.util.List + getInstanceIdentifierPathArgumentsList() { return instanceIdentifierPathArguments_; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } private void initFields() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { output.writeBytes(1, instanceIdentifierPathArguments_.getByteString(i)); @@ -2644,20 +2378,16 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; { int dataSize = 0; for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { - dataSize += - com.google.protobuf.CodedOutputStream - .computeBytesSizeNoTag(instanceIdentifierPathArguments_ - .getByteString(i)); + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(instanceIdentifierPathArguments_.getByteString(i)); } size += dataSize; size += 1 * getInstanceIdentifierPathArgumentsList().size(); @@ -2668,89 +2398,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -2758,49 +2470,45 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.DeleteData} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } public Builder clear() { super.clear(); - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -2809,64 +2517,54 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList( + instanceIdentifierPathArguments_); bitField0_ = (bitField0_ & ~0x00000001); } - result.instanceIdentifierPathArguments_ = - instanceIdentifierPathArguments_; + result.instanceIdentifierPathArguments_ = instanceIdentifierPathArguments_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData.getDefaultInstance()) return this; if (!other.instanceIdentifierPathArguments_.isEmpty()) { if (instanceIdentifierPathArguments_.isEmpty()) { - instanceIdentifierPathArguments_ = - other.instanceIdentifierPathArguments_; + instanceIdentifierPathArguments_ = other.instanceIdentifierPathArguments_; bitField0_ = (bitField0_ & ~0x00000001); } else { ensureInstanceIdentifierPathArgumentsIsMutable(); - instanceIdentifierPathArguments_ - .addAll(other.instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_.addAll(other.instanceIdentifierPathArguments_); } onChanged(); } @@ -2878,17 +2576,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteData) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteData) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -2897,79 +2593,68 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // repeated string instanceIdentifierPathArguments = 1; - private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - + private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInstanceIdentifierPathArgumentsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(instanceIdentifierPathArguments_); bitField0_ |= 0x00000001; - } + } } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { - return java.util.Collections - .unmodifiableList(instanceIdentifierPathArguments_); + public java.util.List + getInstanceIdentifierPathArgumentsList() { + return java.util.Collections.unmodifiableList(instanceIdentifierPathArguments_); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder setInstanceIdentifierPathArguments(int index, - java.lang.String value) { + public Builder setInstanceIdentifierPathArguments( + int index, java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.set(index, value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder addInstanceIdentifierPathArguments(java.lang.String value) { + public Builder addInstanceIdentifierPathArguments( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ @@ -2980,27 +2665,24 @@ public final class ShardTransactionMessages { onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder clearInstanceIdentifierPathArguments() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder addInstanceIdentifierPathArgumentsBytes( com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; @@ -3017,28 +2699,23 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.DeleteData) } - public interface DeleteDataReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface DeleteDataReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.DeleteDataReply} */ public static final class DeleteDataReply extends - com.google.protobuf.GeneratedMessage implements DeleteDataReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements DeleteDataReplyOrBuilder { // Use DeleteDataReply.newBuilder() to construct. - private DeleteDataReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private DeleteDataReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private DeleteDataReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private DeleteDataReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final DeleteDataReply defaultInstance; - public static DeleteDataReply getDefaultInstance() { return defaultInstance; } @@ -3048,13 +2725,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private DeleteDataReply(com.google.protobuf.CodedInputStream input, + private DeleteDataReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -3069,8 +2746,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -3087,58 +2764,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public DeleteDataReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new DeleteDataReply(input, extensionRegistry); - } - }; + public DeleteDataReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new DeleteDataReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -3147,89 +2820,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -3237,41 +2892,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.DeleteDataReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -3285,46 +2937,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -3333,17 +2979,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.DeleteDataReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.DeleteDataReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3364,43 +3008,38 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.DeleteDataReply) } - public interface ReadDataOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface ReadDataOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required string instanceIdentifierPathArguments = 1; /** * required string instanceIdentifierPathArguments = 1; */ boolean hasInstanceIdentifierPathArguments(); - /** * required string instanceIdentifierPathArguments = 1; */ java.lang.String getInstanceIdentifierPathArguments(); - /** * required string instanceIdentifierPathArguments = 1; */ - com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes(); + com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadData} */ public static final class ReadData extends - com.google.protobuf.GeneratedMessage implements ReadDataOrBuilder { + com.google.protobuf.GeneratedMessage + implements ReadDataOrBuilder { // Use ReadData.newBuilder() to construct. private ReadData(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private ReadData(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private ReadData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final ReadData defaultInstance; - public static ReadData getDefaultInstance() { return defaultInstance; } @@ -3410,13 +3049,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private ReadData(com.google.protobuf.CodedInputStream input, + private ReadData( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -3432,8 +3071,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -3455,27 +3094,27 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ReadData parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadData(input, extensionRegistry); - } - }; + public ReadData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadData(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -3486,14 +3125,12 @@ public final class ShardTransactionMessages { // required string instanceIdentifierPathArguments = 1; public static final int INSTANCEIDENTIFIERPATHARGUMENTS_FIELD_NUMBER = 1; private java.lang.Object instanceIdentifierPathArguments_; - /** * required string instanceIdentifierPathArguments = 1; */ public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string instanceIdentifierPathArguments = 1; */ @@ -3511,15 +3148,16 @@ public final class ShardTransactionMessages { return s; } } - /** * required string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes() { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes() { java.lang.Object ref = instanceIdentifierPathArguments_; if (ref instanceof java.lang.String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); instanceIdentifierPathArguments_ = b; return b; } else { @@ -3530,13 +3168,10 @@ public final class ShardTransactionMessages { private void initFields() { instanceIdentifierPathArguments_ = ""; } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasInstanceIdentifierPathArguments()) { memoizedIsInitialized = 0; @@ -3547,7 +3182,7 @@ public final class ShardTransactionMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBytes(1, getInstanceIdentifierPathArgumentsBytes()); @@ -3556,17 +3191,14 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeBytesSize(1, - getInstanceIdentifierPathArgumentsBytes()); + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(1, getInstanceIdentifierPathArgumentsBytes()); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -3574,89 +3206,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -3664,41 +3278,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadData} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -3714,58 +3325,50 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.instanceIdentifierPathArguments_ = - instanceIdentifierPathArguments_; + result.instanceIdentifierPathArguments_ = instanceIdentifierPathArguments_; result.bitField0_ = to_bitField0_; onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData.getDefaultInstance()) return this; if (other.hasInstanceIdentifierPathArguments()) { bitField0_ |= 0x00000001; - instanceIdentifierPathArguments_ = - other.instanceIdentifierPathArguments_; + instanceIdentifierPathArguments_ = other.instanceIdentifierPathArguments_; onChanged(); } this.mergeUnknownFields(other.getUnknownFields()); @@ -3780,17 +3383,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadData) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadData) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -3799,83 +3400,77 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // required string instanceIdentifierPathArguments = 1; private java.lang.Object instanceIdentifierPathArguments_ = ""; - /** * required string instanceIdentifierPathArguments = 1; */ public boolean hasInstanceIdentifierPathArguments() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments() { java.lang.Object ref = instanceIdentifierPathArguments_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = - ((com.google.protobuf.ByteString) ref).toStringUtf8(); + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); instanceIdentifierPathArguments_ = s; return s; } else { return (java.lang.String) ref; } } - /** * required string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes() { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes() { java.lang.Object ref = instanceIdentifierPathArguments_; if (ref instanceof String) { com.google.protobuf.ByteString b = - com.google.protobuf.ByteString - .copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); instanceIdentifierPathArguments_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } - /** * required string instanceIdentifierPathArguments = 1; */ - public Builder setInstanceIdentifierPathArguments(java.lang.String value) { + public Builder setInstanceIdentifierPathArguments( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; instanceIdentifierPathArguments_ = value; onChanged(); return this; } - /** * required string instanceIdentifierPathArguments = 1; */ public Builder clearInstanceIdentifierPathArguments() { bitField0_ = (bitField0_ & ~0x00000001); - instanceIdentifierPathArguments_ = - getDefaultInstance().getInstanceIdentifierPathArguments(); + instanceIdentifierPathArguments_ = getDefaultInstance().getInstanceIdentifierPathArguments(); onChanged(); return this; } - /** * required string instanceIdentifierPathArguments = 1; */ public Builder setInstanceIdentifierPathArgumentsBytes( com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; instanceIdentifierPathArguments_ = value; onChanged(); return this; @@ -3892,44 +3487,37 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.ReadData) } - public interface ReadDataReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface ReadDataReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ boolean hasNormalizedNode(); - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode(); - + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode(); /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadDataReply} */ public static final class ReadDataReply extends - com.google.protobuf.GeneratedMessage implements ReadDataReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements ReadDataReplyOrBuilder { // Use ReadDataReply.newBuilder() to construct. - private ReadDataReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private ReadDataReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private ReadDataReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private ReadDataReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final ReadDataReply defaultInstance; - public static ReadDataReply getDefaultInstance() { return defaultInstance; } @@ -3939,13 +3527,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private ReadDataReply(com.google.protobuf.CodedInputStream input, + private ReadDataReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -3961,23 +3549,18 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; } case 10: { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = - null; + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = normalizedNode_.toBuilder(); } - normalizedNode_ = - input - .readMessage( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, - extensionRegistry); + normalizedNode_ = input.readMessage(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(normalizedNode_); normalizedNode_ = subBuilder.buildPartial(); @@ -3997,27 +3580,27 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public ReadDataReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ReadDataReply(input, extensionRegistry); - } - }; + public ReadDataReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ReadDataReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -4027,41 +3610,33 @@ public final class ShardTransactionMessages { private int bitField0_; // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; public static final int NORMALIZEDNODE_FIELD_NUMBER = 1; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ public boolean hasNormalizedNode() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { return normalizedNode_; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { return normalizedNode_; } private void initFields() { - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasNormalizedNode()) { memoizedIsInitialized = 0; @@ -4076,7 +3651,7 @@ public final class ShardTransactionMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeMessage(1, normalizedNode_); @@ -4085,17 +3660,14 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeMessageSize(1, - normalizedNode_); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, normalizedNode_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -4103,89 +3675,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -4193,42 +3747,39 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.ReadDataReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getNormalizedNodeFieldBuilder(); } } - private static Builder create() { return new Builder(); } @@ -4236,9 +3787,7 @@ public final class ShardTransactionMessages { public Builder clear() { super.clear(); if (normalizedNodeBuilder_ == null) { - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } else { normalizedNodeBuilder_.clear(); } @@ -4250,28 +3799,25 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -4288,19 +3834,16 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply.getDefaultInstance()) return this; if (other.hasNormalizedNode()) { mergeNormalizedNode(other.getNormalizedNode()); } @@ -4320,17 +3863,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.ReadDataReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.ReadDataReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -4339,38 +3880,32 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder normalizedNodeBuilder_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> normalizedNodeBuilder_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ public boolean hasNormalizedNode() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { if (normalizedNodeBuilder_ == null) { return normalizedNode_; } else { return normalizedNodeBuilder_.getMessage(); } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public Builder setNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder setNormalizedNode(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -4383,12 +3918,11 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000001; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ public Builder setNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { if (normalizedNodeBuilder_ == null) { normalizedNode_ = builderForValue.build(); onChanged(); @@ -4398,20 +3932,15 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000001; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public Builder mergeNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder mergeNormalizedNode(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) - && normalizedNode_ != org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance()) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + normalizedNode_ != org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance()) { normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .newBuilder(normalizedNode_).mergeFrom(value) - .buildPartial(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.newBuilder(normalizedNode_).mergeFrom(value).buildPartial(); } else { normalizedNode_ = value; } @@ -4422,15 +3951,12 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000001; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ public Builder clearNormalizedNode() { if (normalizedNodeBuilder_ == null) { - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); onChanged(); } else { normalizedNodeBuilder_.clear(); @@ -4438,35 +3964,36 @@ public final class ShardTransactionMessages { bitField0_ = (bitField0_ & ~0x00000001); return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeBuilder() { bitField0_ |= 0x00000001; onChanged(); return getNormalizedNodeFieldBuilder().getBuilder(); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { if (normalizedNodeBuilder_ != null) { return normalizedNodeBuilder_.getMessageOrBuilder(); } else { return normalizedNode_; } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 1; */ - private com.google.protobuf.SingleFieldBuilder getNormalizedNodeFieldBuilder() { + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> + getNormalizedNodeFieldBuilder() { if (normalizedNodeBuilder_ == null) { - normalizedNodeBuilder_ = - new com.google.protobuf.SingleFieldBuilder( - normalizedNode_, getParentForChildren(), isClean()); + normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder>( + normalizedNode_, + getParentForChildren(), + isClean()); normalizedNode_ = null; } return normalizedNodeBuilder_; @@ -4483,65 +4010,57 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.ReadDataReply) } - public interface WriteDataOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface WriteDataOrBuilder + extends com.google.protobuf.MessageOrBuilder { // repeated string instanceIdentifierPathArguments = 1; /** * repeated string instanceIdentifierPathArguments = 1; */ - java.util.List getInstanceIdentifierPathArgumentsList(); - + java.util.List + getInstanceIdentifierPathArgumentsList(); /** * repeated string instanceIdentifierPathArguments = 1; */ int getInstanceIdentifierPathArgumentsCount(); - /** * repeated string instanceIdentifierPathArguments = 1; */ java.lang.String getInstanceIdentifierPathArguments(int index); - /** * repeated string instanceIdentifierPathArguments = 1; */ - com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index); + com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index); // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ boolean hasNormalizedNode(); - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode(); - + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode(); /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder(); } /** * Protobuf type {@code org.opendaylight.controller.mdsal.WriteData} */ public static final class WriteData extends - com.google.protobuf.GeneratedMessage implements WriteDataOrBuilder { + com.google.protobuf.GeneratedMessage + implements WriteDataOrBuilder { // Use WriteData.newBuilder() to construct. private WriteData(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private WriteData(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private WriteData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final WriteData defaultInstance; - public static WriteData getDefaultInstance() { return defaultInstance; } @@ -4551,13 +4070,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private WriteData(com.google.protobuf.CodedInputStream input, + private WriteData( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -4573,32 +4092,26 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList(); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } instanceIdentifierPathArguments_.add(input.readBytes()); break; } case 18: { - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = - null; + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder subBuilder = null; if (((bitField0_ & 0x00000001) == 0x00000001)) { subBuilder = normalizedNode_.toBuilder(); } - normalizedNode_ = - input - .readMessage( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, - extensionRegistry); + normalizedNode_ = input.readMessage(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.PARSER, extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(normalizedNode_); normalizedNode_ = subBuilder.buildPartial(); @@ -4615,35 +4128,33 @@ public final class ShardTransactionMessages { e.getMessage()).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList(instanceIdentifierPathArguments_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public WriteData parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new WriteData(input, extensionRegistry); - } - }; + public WriteData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new WriteData(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { @@ -4654,75 +4165,63 @@ public final class ShardTransactionMessages { // repeated string instanceIdentifierPathArguments = 1; public static final int INSTANCEIDENTIFIERPATHARGUMENTS_FIELD_NUMBER = 1; private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_; - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { + public java.util.List + getInstanceIdentifierPathArgumentsList() { return instanceIdentifierPathArguments_; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; public static final int NORMALIZEDNODE_FIELD_NUMBER = 2; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ public boolean hasNormalizedNode() { return ((bitField0_ & 0x00000001) == 0x00000001); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { return normalizedNode_; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { return normalizedNode_; } private void initFields() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; if (!hasNormalizedNode()) { memoizedIsInitialized = 0; @@ -4737,7 +4236,7 @@ public final class ShardTransactionMessages { } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { output.writeBytes(1, instanceIdentifierPathArguments_.getByteString(i)); @@ -4749,28 +4248,23 @@ public final class ShardTransactionMessages { } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; { int dataSize = 0; for (int i = 0; i < instanceIdentifierPathArguments_.size(); i++) { - dataSize += - com.google.protobuf.CodedOutputStream - .computeBytesSizeNoTag(instanceIdentifierPathArguments_ - .getByteString(i)); + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(instanceIdentifierPathArguments_.getByteString(i)); } size += dataSize; size += 1 * getInstanceIdentifierPathArgumentsList().size(); } if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += - com.google.protobuf.CodedOutputStream.computeMessageSize(2, - normalizedNode_); + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, normalizedNode_); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -4778,89 +4272,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -4868,55 +4344,49 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.WriteData} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getNormalizedNodeFieldBuilder(); } } - private static Builder create() { return new Builder(); } public Builder clear() { super.clear(); - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); if (normalizedNodeBuilder_ == null) { - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); } else { normalizedNodeBuilder_.clear(); } @@ -4928,38 +4398,33 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.UnmodifiableLazyStringList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.UnmodifiableLazyStringList( + instanceIdentifierPathArguments_); bitField0_ = (bitField0_ & ~0x00000001); } - result.instanceIdentifierPathArguments_ = - instanceIdentifierPathArguments_; + result.instanceIdentifierPathArguments_ = instanceIdentifierPathArguments_; if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000001; } @@ -4974,28 +4439,23 @@ public final class ShardTransactionMessages { } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData.getDefaultInstance()) return this; if (!other.instanceIdentifierPathArguments_.isEmpty()) { if (instanceIdentifierPathArguments_.isEmpty()) { - instanceIdentifierPathArguments_ = - other.instanceIdentifierPathArguments_; + instanceIdentifierPathArguments_ = other.instanceIdentifierPathArguments_; bitField0_ = (bitField0_ & ~0x00000001); } else { ensureInstanceIdentifierPathArgumentsIsMutable(); - instanceIdentifierPathArguments_ - .addAll(other.instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_.addAll(other.instanceIdentifierPathArguments_); } onChanged(); } @@ -5018,17 +4478,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteData) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteData) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5037,79 +4495,68 @@ public final class ShardTransactionMessages { } return this; } - private int bitField0_; // repeated string instanceIdentifierPathArguments = 1; - private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; - + private com.google.protobuf.LazyStringList instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureInstanceIdentifierPathArgumentsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - instanceIdentifierPathArguments_ = - new com.google.protobuf.LazyStringArrayList( - instanceIdentifierPathArguments_); + instanceIdentifierPathArguments_ = new com.google.protobuf.LazyStringArrayList(instanceIdentifierPathArguments_); bitField0_ |= 0x00000001; - } + } } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public java.util.List getInstanceIdentifierPathArgumentsList() { - return java.util.Collections - .unmodifiableList(instanceIdentifierPathArguments_); + public java.util.List + getInstanceIdentifierPathArgumentsList() { + return java.util.Collections.unmodifiableList(instanceIdentifierPathArguments_); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public int getInstanceIdentifierPathArgumentsCount() { return instanceIdentifierPathArguments_.size(); } - /** * repeated string instanceIdentifierPathArguments = 1; */ public java.lang.String getInstanceIdentifierPathArguments(int index) { return instanceIdentifierPathArguments_.get(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public com.google.protobuf.ByteString getInstanceIdentifierPathArgumentsBytes( - int index) { + public com.google.protobuf.ByteString + getInstanceIdentifierPathArgumentsBytes(int index) { return instanceIdentifierPathArguments_.getByteString(index); } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder setInstanceIdentifierPathArguments(int index, - java.lang.String value) { + public Builder setInstanceIdentifierPathArguments( + int index, java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.set(index, value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ - public Builder addInstanceIdentifierPathArguments(java.lang.String value) { + public Builder addInstanceIdentifierPathArguments( + java.lang.String value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ @@ -5120,61 +4567,53 @@ public final class ShardTransactionMessages { onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder clearInstanceIdentifierPathArguments() { - instanceIdentifierPathArguments_ = - com.google.protobuf.LazyStringArrayList.EMPTY; + instanceIdentifierPathArguments_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } - /** * repeated string instanceIdentifierPathArguments = 1; */ public Builder addInstanceIdentifierPathArgumentsBytes( com.google.protobuf.ByteString value) { if (value == null) { - throw new NullPointerException(); - } - ensureInstanceIdentifierPathArgumentsIsMutable(); + throw new NullPointerException(); + } + ensureInstanceIdentifierPathArgumentsIsMutable(); instanceIdentifierPathArguments_.add(value); onChanged(); return this; } // required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; - private org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder normalizedNodeBuilder_; - + private org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> normalizedNodeBuilder_; /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ public boolean hasNormalizedNode() { return ((bitField0_ & 0x00000002) == 0x00000002); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml getNormalizedNode() { if (normalizedNodeBuilder_ == null) { return normalizedNode_; } else { return normalizedNodeBuilder_.getMessage(); } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public Builder setNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder setNormalizedNode(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5187,12 +4626,11 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ public Builder setNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder builderForValue) { if (normalizedNodeBuilder_ == null) { normalizedNode_ = builderForValue.build(); onChanged(); @@ -5202,20 +4640,15 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public Builder mergeNormalizedNode( - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { + public Builder mergeNormalizedNode(org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml value) { if (normalizedNodeBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) - && normalizedNode_ != org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance()) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + normalizedNode_ != org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance()) { normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .newBuilder(normalizedNode_).mergeFrom(value) - .buildPartial(); + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.newBuilder(normalizedNode_).mergeFrom(value).buildPartial(); } else { normalizedNode_ = value; } @@ -5226,15 +4659,12 @@ public final class ShardTransactionMessages { bitField0_ |= 0x00000002; return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ public Builder clearNormalizedNode() { if (normalizedNodeBuilder_ == null) { - normalizedNode_ = - org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml - .getDefaultInstance(); + normalizedNode_ = org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.getDefaultInstance(); onChanged(); } else { normalizedNodeBuilder_.clear(); @@ -5242,35 +4672,36 @@ public final class ShardTransactionMessages { bitField0_ = (bitField0_ & ~0x00000002); return this; } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder getNormalizedNodeBuilder() { bitField0_ |= 0x00000002; onChanged(); return getNormalizedNodeFieldBuilder().getBuilder(); } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - public org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { + public org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder getNormalizedNodeOrBuilder() { if (normalizedNodeBuilder_ != null) { return normalizedNodeBuilder_.getMessageOrBuilder(); } else { return normalizedNode_; } } - /** * required .org.opendaylight.controller.mdsal.NormalizedNodeXml normalizedNode = 2; */ - private com.google.protobuf.SingleFieldBuilder getNormalizedNodeFieldBuilder() { + private com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder> + getNormalizedNodeFieldBuilder() { if (normalizedNodeBuilder_ == null) { - normalizedNodeBuilder_ = - new com.google.protobuf.SingleFieldBuilder( - normalizedNode_, getParentForChildren(), isClean()); + normalizedNodeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXml.Builder, org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.NormalizedNodeXmlOrBuilder>( + normalizedNode_, + getParentForChildren(), + isClean()); normalizedNode_ = null; } return normalizedNodeBuilder_; @@ -5287,28 +4718,23 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.WriteData) } - public interface WriteDataReplyOrBuilder extends - com.google.protobuf.MessageOrBuilder { + public interface WriteDataReplyOrBuilder + extends com.google.protobuf.MessageOrBuilder { } /** * Protobuf type {@code org.opendaylight.controller.mdsal.WriteDataReply} */ public static final class WriteDataReply extends - com.google.protobuf.GeneratedMessage implements WriteDataReplyOrBuilder { + com.google.protobuf.GeneratedMessage + implements WriteDataReplyOrBuilder { // Use WriteDataReply.newBuilder() to construct. - private WriteDataReply( - com.google.protobuf.GeneratedMessage.Builder builder) { + private WriteDataReply(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - - private WriteDataReply(boolean noInit) { - this.unknownFields = - com.google.protobuf.UnknownFieldSet.getDefaultInstance(); - } + private WriteDataReply(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } private static final WriteDataReply defaultInstance; - public static WriteDataReply getDefaultInstance() { return defaultInstance; } @@ -5318,13 +4744,13 @@ public final class ShardTransactionMessages { } private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { return this.unknownFields; } - - private WriteDataReply(com.google.protobuf.CodedInputStream input, + private WriteDataReply( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { initFields(); @@ -5339,8 +4765,8 @@ public final class ShardTransactionMessages { done = true; break; default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, - tag)) { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { done = true; } break; @@ -5357,58 +4783,54 @@ public final class ShardTransactionMessages { makeExtensionsImmutable(); } } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.Builder.class); } public static com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - public WriteDataReply parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new WriteDataReply(input, extensionRegistry); - } - }; + public WriteDataReply parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new WriteDataReply(input, extensionRegistry); + } + }; @java.lang.Override public com.google.protobuf.Parser getParserForType() { return PARSER; } - private void initFields() {} - + private void initFields() { + } private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) - return isInitialized == 1; + if (isInitialized != -1) return isInitialized == 1; memoizedIsInitialized = 1; return true; } public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + throws java.io.IOException { getSerializedSize(); getUnknownFields().writeTo(output); } private int memoizedSerializedSize = -1; - public int getSerializedSize() { int size = memoizedSerializedSize; - if (size != -1) - return size; + if (size != -1) return size; size = 0; size += getUnknownFields().getSerializedSize(); @@ -5417,89 +4839,71 @@ public final class ShardTransactionMessages { } private static final long serialVersionUID = 0L; - @java.lang.Override protected java.lang.Object writeReplace() throws java.io.ObjectStreamException { return super.writeReplace(); } - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( - byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseDelimitedFrom( - java.io.InputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseDelimitedFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( - com.google.protobuf.CodedInputStream input) throws java.io.IOException { + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { return PARSER.parseFrom(input); } - - public static org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parseFrom( + public static org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static Builder newBuilder() { - return Builder.create(); - } - - public Builder newBuilderForType() { - return newBuilder(); - } - - public static Builder newBuilder( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply prototype) { + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply prototype) { return newBuilder().mergeFrom(prototype); } - - public Builder toBuilder() { - return newBuilder(this); - } + public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( @@ -5507,41 +4911,38 @@ public final class ShardTransactionMessages { Builder builder = new Builder(parent); return builder; } - /** * Protobuf type {@code org.opendaylight.controller.mdsal.WriteDataReply} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReplyOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; + implements org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReplyOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply.class, - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply.Builder.class); + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.class, org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.Builder.class); } - // Construct using - // org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply.newBuilder() + // Construct using org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.newBuilder() private Builder() { maybeForceBuilderInitialization(); } - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } - private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { } } - private static Builder create() { return new Builder(); } @@ -5555,46 +4956,40 @@ public final class ShardTransactionMessages { return create().mergeFrom(buildPartial()); } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply getDefaultInstanceForType() { - return org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply - .getDefaultInstance(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply getDefaultInstanceForType() { + return org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.getDefaultInstance(); } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply build() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply result = - buildPartial(); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply build() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply buildPartial() { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply result = - new org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply( - this); + public org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply buildPartial() { + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply result = new org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply(this); onBuilt(); return result; } public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply) { - return mergeFrom((org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply) other); + if (other instanceof org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply) { + return mergeFrom((org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom( - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply other) { - if (other == org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply - .getDefaultInstance()) - return this; + public Builder mergeFrom(org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply other) { + if (other == org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply.getDefaultInstance()) return this; this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -5603,17 +4998,15 @@ public final class ShardTransactionMessages { return true; } - public Builder mergeFrom(com.google.protobuf.CodedInputStream input, + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply parsedMessage = - null; + org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = - (org.opendaylight.controller.cluster.datastore.transaction.ShardTransactionMessages.WriteDataReply) e - .getUnfinishedMessage(); + parsedMessage = (org.opendaylight.controller.protobuff.messages.transaction.ShardTransactionMessages.WriteDataReply) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -5634,143 +5027,180 @@ public final class ShardTransactionMessages { // @@protoc_insertion_point(class_scope:org.opendaylight.controller.mdsal.WriteDataReply) } - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; - private static com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { - java.lang.String[] descriptorData = - { - "\n\026ShardTransaction.proto\022!org.opendaylig" - + "ht.controller.mdsal\032\032SimpleNormalizedNod" - + "e.proto\"\022\n\020CloseTransaction\"\027\n\025CloseTran" - + "sactionReply\"\023\n\021CreateTransaction\"1\n\026Cre" - + "ateTransactionReply\022\027\n\017transactionPath\030\001" - + " \002(\t\"\022\n\020ReadyTransaction\"*\n\025ReadyTransac" - + "tionReply\022\021\n\tactorPath\030\001 \002(\t\"5\n\nDeleteDa" - + "ta\022\'\n\037instanceIdentifierPathArguments\030\001 " - + "\003(\t\"\021\n\017DeleteDataReply\"3\n\010ReadData\022\'\n\037in" - + "stanceIdentifierPathArguments\030\001 \002(\t\"]\n\rR", - "eadDataReply\022L\n\016normalizedNode\030\001 \002(\01324.o" - + "rg.opendaylight.controller.mdsal.Normali" - + "zedNodeXml\"\202\001\n\tWriteData\022\'\n\037instanceIden" - + "tifierPathArguments\030\001 \003(\t\022L\n\016normalizedN" - + "ode\030\002 \002(\01324.org.opendaylight.controller." - + "mdsal.NormalizedNodeXml\"\020\n\016WriteDataRepl" - + "yBU\n9org.opendaylight.controller.cluster" - + ".datastore.transactionB\030ShardTransaction" + "Messages"}; + java.lang.String[] descriptorData = { + "\n\026ShardTransaction.proto\022!org.opendaylig" + + "ht.controller.mdsal\032\032SimpleNormalizedNod" + + "e.proto\"\022\n\020CloseTransaction\"\027\n\025CloseTran" + + "sactionReply\"\023\n\021CreateTransaction\"1\n\026Cre" + + "ateTransactionReply\022\027\n\017transactionPath\030\001" + + " \002(\t\"\022\n\020ReadyTransaction\"*\n\025ReadyTransac" + + "tionReply\022\021\n\tactorPath\030\001 \002(\t\"5\n\nDeleteDa" + + "ta\022\'\n\037instanceIdentifierPathArguments\030\001 " + + "\003(\t\"\021\n\017DeleteDataReply\"3\n\010ReadData\022\'\n\037in" + + "stanceIdentifierPathArguments\030\001 \002(\t\"]\n\rR", + "eadDataReply\022L\n\016normalizedNode\030\001 \002(\01324.o" + + "rg.opendaylight.controller.mdsal.Normali" + + "zedNodeXml\"\202\001\n\tWriteData\022\'\n\037instanceIden" + + "tifierPathArguments\030\001 \003(\t\022L\n\016normalizedN" + + "ode\030\002 \002(\01324.org.opendaylight.controller." + + "mdsal.NormalizedNodeXml\"\020\n\016WriteDataRepl" + + "yBV\n:org.opendaylight.controller.protobu" + + "ff.messages.transactionB\030ShardTransactio" + + "nMessages" + }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor, - new java.lang.String[] {"TransactionPath",}); - internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor, - new java.lang.String[] {"ActorPath",}); - internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor = - getDescriptor().getMessageTypes().get(6); - internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor, - new java.lang.String[] {"InstanceIdentifierPathArguments",}); - internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor = - getDescriptor().getMessageTypes().get(7); - internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor, - new java.lang.String[] {}); - internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor = - getDescriptor().getMessageTypes().get(8); - internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor, - new java.lang.String[] {"InstanceIdentifierPathArguments",}); - internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor = - getDescriptor().getMessageTypes().get(9); - internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor, - new java.lang.String[] {"NormalizedNode",}); - internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor = - getDescriptor().getMessageTypes().get(10); - internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor, - new java.lang.String[] {"InstanceIdentifierPathArguments", - "NormalizedNode",}); - internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor = - getDescriptor().getMessageTypes().get(11); - internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor, - new java.lang.String[] {}); - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_opendaylight_controller_mdsal_CloseTransaction_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CloseTransaction_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CloseTransactionReply_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_org_opendaylight_controller_mdsal_CreateTransaction_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CreateTransaction_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_CreateTransactionReply_descriptor, + new java.lang.String[] { "TransactionPath", }); + internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_ReadyTransaction_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_ReadyTransactionReply_descriptor, + new java.lang.String[] { "ActorPath", }); + internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor = + getDescriptor().getMessageTypes().get(6); + internal_static_org_opendaylight_controller_mdsal_DeleteData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_DeleteData_descriptor, + new java.lang.String[] { "InstanceIdentifierPathArguments", }); + internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor = + getDescriptor().getMessageTypes().get(7); + internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_DeleteDataReply_descriptor, + new java.lang.String[] { }); + internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor = + getDescriptor().getMessageTypes().get(8); + internal_static_org_opendaylight_controller_mdsal_ReadData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_ReadData_descriptor, + new java.lang.String[] { "InstanceIdentifierPathArguments", }); + internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor = + getDescriptor().getMessageTypes().get(9); + internal_static_org_opendaylight_controller_mdsal_ReadDataReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_ReadDataReply_descriptor, + new java.lang.String[] { "NormalizedNode", }); + internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor = + getDescriptor().getMessageTypes().get(10); + internal_static_org_opendaylight_controller_mdsal_WriteData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_WriteData_descriptor, + new java.lang.String[] { "InstanceIdentifierPathArguments", "NormalizedNode", }); + internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor = + getDescriptor().getMessageTypes().get(11); + internal_static_org_opendaylight_controller_mdsal_WriteDataReply_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_opendaylight_controller_mdsal_WriteDataReply_descriptor, + new java.lang.String[] { }); + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom( - descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] {org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage - .getDescriptor(),}, assigner); + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage.getDescriptor(), + }, assigner); } // @@protoc_insertion_point(outer_class_scope) diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto index 61f51418de..f50c36f684 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/DataChangeListener.proto @@ -2,7 +2,7 @@ package org.opendaylight.controller.mdsal; import "SimpleNormalizedNode.proto"; -option java_package = "org.opendaylight.controller.cluster.datastore.datachange.notification"; +option java_package = "org.opendaylight.controller.protobuff.messages.datachange.notification"; option java_outer_classname = "DataChangeListenerMessages"; message DataChanged{ diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto index ec8046f557..27f3c232e7 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ListenerRegistration.proto @@ -1,6 +1,6 @@ package org.opendaylight.controller.mdsal; -option java_package = "org.opendaylight.controller.cluster.datastore.registration"; +option java_package = "org.opendaylight.controller.protobuff.messages.registration"; option java_outer_classname = "ListenerRegistrationMessages"; message Close { diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto index 31e8c58b13..c86fde0c72 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardManager.proto @@ -1,6 +1,6 @@ package org.opendaylight.controller.mdsal; -option java_package = "org.opendaylight.controller.cluster.datastore.shard"; +option java_package = "org.opendaylight.controller.protobuff.messages.shard"; option java_outer_classname = "ShardManagerMessages"; message FindPrimary { diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto index f22a6db84d..120913eb66 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransaction.proto @@ -1,8 +1,6 @@ package org.opendaylight.controller.mdsal; - import "SimpleNormalizedNode.proto"; - -option java_package = "org.opendaylight.controller.cluster.datastore.transaction"; +option java_package = "org.opendaylight.controller.protobuff.messages.transaction"; option java_outer_classname = "ShardTransactionMessages"; message CloseTransaction{ diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto index 73a9aa11c8..42f87cbda6 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/ShardTransactionChain.proto @@ -1,6 +1,6 @@ package org.opendaylight.controller.mdsal; -option java_package = "org.opendaylight.controller.cluster.datastore.transaction"; +option java_package = "org.opendaylight.controller.protobuff.messages.transaction"; option java_outer_classname = "ShardTransactionChainMessages"; message CloseTransactionChain { diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto index a1f35f19fb..e0b21d3011 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/main/resources/SimpleNormalizedNode.proto @@ -1,6 +1,6 @@ package org.opendaylight.controller.mdsal; -option java_package = "org.opendaylight.controller.cluster.datastore.common"; +option java_package = "org.opendaylight.controller.protobuff.messages.common"; option java_outer_classname = "SimpleNormalizedNodeMessage"; message NormalizedNodeXml { diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java index 45e3ea5be3..02deb5a815 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/util/NormalizedNodeXmlConverterTest.java @@ -14,7 +14,7 @@ import com.google.common.collect.Sets; import org.custommonkey.xmlunit.Diff; import org.custommonkey.xmlunit.XMLUnit; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.common.SimpleNormalizedNodeMessage; +import org.opendaylight.controller.protobuff.messages.common.SimpleNormalizedNodeMessage; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode; diff --git a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ShardManagerMessagesTest.java b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/ShardManagerMessagesTest.java similarity index 88% rename from opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ShardManagerMessagesTest.java rename to opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/ShardManagerMessagesTest.java index 353afe992c..b0758da9d1 100644 --- a/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/cluster/datastore/messages/ShardManagerMessagesTest.java +++ b/opendaylight/md-sal/sal-protocolbuffer-encoding/src/test/java/org/opendaylight/controller/protobuff/messages/ShardManagerMessagesTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.controller.cluster.datastore.messages; +package org.opendaylight.controller.protobuff.messages; /** * This test case is present to ensure that if others have used proper version of protocol buffer. @@ -12,7 +12,7 @@ package org.opendaylight.controller.cluster.datastore.messages; import org.junit.Assert; import org.junit.Test; -import org.opendaylight.controller.cluster.datastore.shard.ShardManagerMessages; +import org.opendaylight.controller.protobuff.messages.shard.ShardManagerMessages; import java.io.File; import java.io.FileInputStream; diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java index 056be72d4e..2f11d8ed7d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/api/RestconfService.java @@ -10,42 +10,41 @@ package org.opendaylight.controller.sal.rest.api; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; import javax.ws.rs.DefaultValue; +import javax.ws.rs.Encoded; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; -import javax.ws.rs.Encoded; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - import org.opendaylight.controller.sal.restconf.impl.StructuredData; import org.opendaylight.yangtools.yang.data.api.CompositeNode; /** - * The URI hierarchy for the RESTCONF resources consists of an entry - * point container, 4 top-level resources, and 1 field. - *

      - *
    • /restconf - {@link #getRoot()} - *
        - *
      • /config - {@link #readConfigurationData(String)} - * {@link #updateConfigurationData(String, CompositeNode)} - * {@link #createConfigurationData(CompositeNode)} - * {@link #createConfigurationData(String, CompositeNode)} - * {@link #deleteConfigurationData(String)} - *
      • /operational - {@link #readOperationalData(String)} - *
      • /modules - {@link #getModules()} - *
          - *
        • /module - *
        - *
      • /operations - {@link #invokeRpc(String, CompositeNode)} - * {@link #invokeRpc(String, CompositeNode)} - *
      • /version (field) - *
      - *
    + * The URI hierarchy for the RESTCONF resources consists of an entry point + * container, 4 top-level resources, and 1 field. + *
      + *
    • /restconf - {@link #getRoot()} + *
        + *
      • /config - {@link #readConfigurationData(String)} + * {@link #updateConfigurationData(String, CompositeNode)} + * {@link #createConfigurationData(CompositeNode)} + * {@link #createConfigurationData(String, CompositeNode)} + * {@link #deleteConfigurationData(String)} + *
      • /operational - {@link #readOperationalData(String)} + *
      • /modules - {@link #getModules()} + *
          + *
        • /module + *
        + *
      • /operations - {@link #invokeRpc(String, CompositeNode)} + * {@link #invokeRpc(String, CompositeNode)} + *
      • /version (field) + *
      + *
    */ @Path("/") public interface RestconfService { @@ -58,81 +57,81 @@ public interface RestconfService { @GET @Path("/modules") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getModules(); + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getModules(@Context UriInfo uriInfo); @GET @Path("/modules/{identifier:.+}") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getModules(@PathParam("identifier") String identifier); + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getModules(@PathParam("identifier") String identifier, @Context UriInfo uriInfo); @GET @Path("/modules/module/{identifier:.+}") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getModule(@PathParam("identifier") String identifier); + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getModule(@PathParam("identifier") String identifier, @Context UriInfo uriInfo); @GET @Path("/operations") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getOperations(); + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getOperations(@Context UriInfo uriInfo); @GET @Path("/operations/{identifier:.+}") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getOperations(@PathParam("identifier") String identifier); + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getOperations(@PathParam("identifier") String identifier, @Context UriInfo uriInfo); @POST @Path("/operations/{identifier:.+}") - @Produces({Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+XML, - Draft02.MediaTypes.DATA+JSON, Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - @Consumes({Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+XML, - Draft02.MediaTypes.DATA+JSON, Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); + @Produces({ Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + XML, + Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + @Consumes({ Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + XML, + Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, CompositeNode payload, @Context UriInfo uriInfo); @POST @Path("/operations/{identifier:.+}") - @Produces({Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+XML, - Draft02.MediaTypes.DATA+JSON, Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, @DefaultValue("") String noPayload); + @Produces({ Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + XML, + Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData invokeRpc(@Encoded @PathParam("identifier") String identifier, + @DefaultValue("") String noPayload, @Context UriInfo uriInfo); @GET @Path("/config/{identifier:.+}") - @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) + @Produces({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) public StructuredData readConfigurationData(@Encoded @PathParam("identifier") String identifier, - @Context UriInfo depth); + @Context UriInfo uriInfo); @GET @Path("/operational/{identifier:.+}") - @Produces({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData readOperationalData(@Encoded @PathParam("identifier") String identifier, - @Context UriInfo depth); + @Produces({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData readOperationalData(@Encoded @PathParam("identifier") String identifier, @Context UriInfo uriInfo); @PUT @Path("/config/{identifier:.+}") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) + @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) public Response updateConfigurationData(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); @POST @Path("/config/{identifier:.+}") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) + @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) public Response createConfigurationData(@Encoded @PathParam("identifier") String identifier, CompositeNode payload); @POST @Path("/config") - @Consumes({Draft02.MediaTypes.DATA+JSON,Draft02.MediaTypes.DATA+XML, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) + @Consumes({ Draft02.MediaTypes.DATA + JSON, Draft02.MediaTypes.DATA + XML, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) public Response createConfigurationData(CompositeNode payload); @DELETE @@ -145,9 +144,8 @@ public interface RestconfService { @GET @Path("/streams") - @Produces({Draft02.MediaTypes.API+XML, Draft02.MediaTypes.API+JSON, - MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML, MediaType.TEXT_XML}) - public StructuredData getAvailableStreams(); - + @Produces({ Draft02.MediaTypes.API + XML, Draft02.MediaTypes.API + JSON, MediaType.APPLICATION_JSON, + MediaType.APPLICATION_XML, MediaType.TEXT_XML }) + public StructuredData getAvailableStreams(@Context UriInfo uriInfo); } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/gson/JsonParser.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/gson/JsonParser.java new file mode 100644 index 0000000000..f3b61de457 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/gson/JsonParser.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.sal.rest.gson; + +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonIOException; +import com.google.gson.JsonNull; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.JsonPrimitive; +import com.google.gson.JsonSyntaxException; +import com.google.gson.internal.LazilyParsedNumber; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.MalformedJsonException; +import java.io.EOFException; +import java.io.IOException; + +/** + * This class parses JSON elements from a gson JsonReader. It disallows multiple + * elements of the same name unlike the default gson JsonParser." + */ +public class JsonParser { + public JsonElement parse(JsonReader reader) throws JsonIOException, JsonSyntaxException { + // code copied from gson's JsonParser and Stream classes + + boolean lenient = reader.isLenient(); + reader.setLenient(true); + boolean isEmpty = true; + try { + reader.peek(); + isEmpty = false; + return read(reader); + } catch (EOFException e) { + if (isEmpty) { + return JsonNull.INSTANCE; + } + // The stream ended prematurely so it is likely a syntax error. + throw new JsonSyntaxException(e); + } catch (MalformedJsonException e) { + throw new JsonSyntaxException(e); + } catch (IOException e) { + throw new JsonIOException(e); + } catch (NumberFormatException e) { + throw new JsonSyntaxException(e); + } catch (StackOverflowError | OutOfMemoryError e) { + throw new JsonParseException("Failed parsing JSON source: " + reader + " to Json", e); + } finally { + reader.setLenient(lenient); + } + } + + public JsonElement read(JsonReader in) throws IOException { + switch (in.peek()) { + case STRING: + return new JsonPrimitive(in.nextString()); + case NUMBER: + String number = in.nextString(); + return new JsonPrimitive(new LazilyParsedNumber(number)); + case BOOLEAN: + return new JsonPrimitive(in.nextBoolean()); + case NULL: + in.nextNull(); + return JsonNull.INSTANCE; + case BEGIN_ARRAY: + JsonArray array = new JsonArray(); + in.beginArray(); + while (in.hasNext()) { + array.add(read(in)); + } + in.endArray(); + return array; + case BEGIN_OBJECT: + JsonObject object = new JsonObject(); + in.beginObject(); + while (in.hasNext()) { + final String childName = in.nextName(); + if (object.has(childName)) { + throw new JsonSyntaxException("Duplicate name " + childName + " in JSON input."); + } + object.add(childName, read(in)); + } + in.endObject(); + return object; + case END_DOCUMENT: + case NAME: + case END_OBJECT: + case END_ARRAY: + default: + throw new IllegalArgumentException(); + } + } +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java index 9e69665405..211e7e818a 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeProvider.java @@ -11,14 +11,12 @@ import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; - import javax.ws.rs.Consumes; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.Provider; - import org.opendaylight.controller.sal.rest.api.Draft02; import org.opendaylight.controller.sal.rest.api.RestconfService; import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; @@ -34,25 +32,28 @@ import org.slf4j.LoggerFactory; public enum JsonToCompositeNodeProvider implements MessageBodyReader { INSTANCE; - private final static Logger LOG = LoggerFactory.getLogger( JsonToCompositeNodeProvider.class ); + private final static Logger LOG = LoggerFactory.getLogger(JsonToCompositeNodeProvider.class); @Override - public boolean isReadable(final Class type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) { + public boolean isReadable(final Class type, final Type genericType, + final Annotation[] annotations, final MediaType mediaType) { return true; } @Override - public CompositeNode readFrom(final Class type, final Type genericType, final Annotation[] annotations, - final MediaType mediaType, final MultivaluedMap httpHeaders, final InputStream entityStream) - throws IOException, WebApplicationException { + public CompositeNode readFrom(final Class type, final Type genericType, + final Annotation[] annotations, final MediaType mediaType, + final MultivaluedMap httpHeaders, + final InputStream entityStream) + throws IOException, WebApplicationException { try { - return JsonReader.read(entityStream); + return JsonToCompositeNodeReader.read(entityStream); } catch (Exception e) { LOG.debug( "Error parsing json input", e); + throw new RestconfDocumentedException( "Error parsing input: " + e.getMessage(), ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE); } } - } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeReader.java similarity index 86% rename from opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java rename to opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeReader.java index e945540618..082675b6d1 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/JsonToCompositeNodeReader.java @@ -11,16 +11,17 @@ import com.google.common.base.Splitter; import com.google.common.collect.Iterators; import com.google.gson.JsonElement; import com.google.gson.JsonObject; -import com.google.gson.JsonParser; import com.google.gson.JsonPrimitive; +import com.google.gson.stream.JsonReader; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URI; -import java.util.Iterator; import java.util.Map.Entry; +import java.util.Iterator; import java.util.Set; +import org.opendaylight.controller.sal.rest.gson.JsonParser; import org.opendaylight.controller.sal.rest.impl.RestUtil.PrefixMapingFromJson; import org.opendaylight.controller.sal.restconf.impl.CompositeNodeWrapper; import org.opendaylight.controller.sal.restconf.impl.EmptyNodeWrapper; @@ -29,20 +30,22 @@ import org.opendaylight.controller.sal.restconf.impl.SimpleNodeWrapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -final class JsonReader { +class JsonToCompositeNodeReader { private static final Logger LOG = LoggerFactory.getLogger(JsonReader.class); private static final Splitter COLON_SPLITTER = Splitter.on(':'); - private JsonReader() { + private JsonToCompositeNodeReader() { } - public static CompositeNodeWrapper read(final InputStream entityStream) throws UnsupportedFormatException { + public static CompositeNodeWrapper read(final InputStream entityStream) + throws UnsupportedFormatException { JsonParser parser = new JsonParser(); - JsonElement rootElement = parser.parse(new InputStreamReader(entityStream)); + JsonElement rootElement = parser.parse(new JsonReader( + new InputStreamReader(entityStream))); if (rootElement.isJsonNull()) { - //no content, so return null to indicate no input + // no content, so return null to indicate no input return null; } @@ -50,7 +53,8 @@ final class JsonReader { throw new UnsupportedFormatException("Root element of Json has to be Object"); } - Set> entrySetsOfRootJsonObject = rootElement.getAsJsonObject().entrySet(); + Set> entrySetsOfRootJsonObject = + rootElement.getAsJsonObject().entrySet(); if (entrySetsOfRootJsonObject.size() != 1) { throw new UnsupportedFormatException("Json Object should contain one element"); } @@ -77,7 +81,8 @@ final class JsonReader { "First element in Json Object has to be \"Object\" or \"Array with one Object element\". Other scenarios are not supported yet."); } - private static CompositeNodeWrapper createStructureWithRoot(final String rootObjectName, final JsonObject rootObject) { + private static CompositeNodeWrapper createStructureWithRoot(final String rootObjectName, + final JsonObject rootObject) { CompositeNodeWrapper firstNode = new CompositeNodeWrapper(getNamespaceFor(rootObjectName), getLocalNameFor(rootObjectName)); for (Entry childOfFirstNode : rootObject.entrySet()) { @@ -86,9 +91,11 @@ final class JsonReader { return firstNode; } - private static void addChildToParent(final String childName, final JsonElement childType, final CompositeNodeWrapper parent) { + private static void addChildToParent(final String childName, final JsonElement childType, + final CompositeNodeWrapper parent) { if (childType.isJsonObject()) { - CompositeNodeWrapper child = new CompositeNodeWrapper(getNamespaceFor(childName), getLocalNameFor(childName)); + CompositeNodeWrapper child = new CompositeNodeWrapper(getNamespaceFor(childName), + getLocalNameFor(childName)); parent.addValue(child); for (Entry childOfChild : childType.getAsJsonObject().entrySet()) { addChildToParent(childOfChild.getKey(), childOfChild.getValue(), child); @@ -96,6 +103,7 @@ final class JsonReader { } else if (childType.isJsonArray()) { if (childType.getAsJsonArray().size() == 1 && childType.getAsJsonArray().get(0).isJsonNull()) { parent.addValue(new EmptyNodeWrapper(getNamespaceFor(childName), getLocalNameFor(childName))); + } else { for (JsonElement childOfChildType : childType.getAsJsonArray()) { addChildToParent(childName, childOfChildType, parent); @@ -145,8 +153,9 @@ final class JsonReader { // it could be identityref Built-In Type URI namespace = getNamespaceFor(value); if (namespace != null) { - return new IdentityValuesDTO(namespace.toString(), getLocalNameFor(value), null,value); + return new IdentityValuesDTO(namespace.toString(), getLocalNameFor(value), null, value); } + // it is not "prefix:value" but just "value" return value; } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java index 2abd4b6a3a..1c95f1327b 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/RestconfProvider.java @@ -51,12 +51,15 @@ public class RestconfProvider implements BundleActivator, Provider, ServiceTrack @Override public void start(BundleContext context) throws Exception { + String websocketPortStr = context.getProperty(WebSocketServer.WEBSOCKET_SERVER_CONFIG_PROPERTY); + int websocketPort = (websocketPortStr != null && !"".equals(websocketPortStr)) + ? Integer.parseInt(websocketPortStr) : WebSocketServer.DEFAULT_PORT; bundleContext = context; - brokerServiceTrancker = new ServiceTracker<>(context, Broker.class, this); - brokerServiceTrancker.open(); - webSocketServerThread = new Thread(new WebSocketServer()); + webSocketServerThread = new Thread(WebSocketServer.createInstance(websocketPort)); webSocketServerThread.setName("Web socket server"); webSocketServerThread.start(); + brokerServiceTrancker = new ServiceTracker<>(context, Broker.class, this); + brokerServiceTrancker.open(); } @Override diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/StructuredDataToJsonProvider.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/StructuredDataToJsonProvider.java index 1c2e9c5009..063d2f51af 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/StructuredDataToJsonProvider.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/StructuredDataToJsonProvider.java @@ -9,13 +9,11 @@ package org.opendaylight.controller.sal.rest.impl; import com.google.common.base.Charsets; import com.google.gson.stream.JsonWriter; - import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.lang.annotation.Annotation; import java.lang.reflect.Type; - import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; @@ -23,7 +21,6 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; - import org.opendaylight.controller.sal.rest.api.Draft02; import org.opendaylight.controller.sal.rest.api.RestconfService; import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; @@ -39,7 +36,7 @@ public enum StructuredDataToJsonProvider implements MessageBodyWriter type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) { - return type.equals( StructuredData.class ); + return type.equals(StructuredData.class); } @Override @@ -57,10 +54,14 @@ public enum StructuredDataToJsonProvider implements MessageBodyWriter type, final Type genericType, final Annotation[] annotations, final MediaType mediaType) { - return type.equals( StructuredData.class ); + return type.equals(StructuredData.class); } @Override @@ -90,6 +88,11 @@ public enum StructuredDataToXmlProvider implements MessageBodyWriter { INSTANCE; - private final static Logger LOG = LoggerFactory.getLogger( XmlToCompositeNodeProvider.class ); + private final static Logger LOG = LoggerFactory.getLogger(XmlToCompositeNodeProvider.class); @Override public boolean isReadable(Class type, Type genericType, Annotation[] annotations, MediaType mediaType) { @@ -46,14 +44,13 @@ public enum XmlToCompositeNodeProvider implements MessageBodyReader type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap httpHeaders, InputStream entityStream) throws IOException, WebApplicationException { - XmlReader xmlReader = new XmlReader(); + XmlToCompositeNodeReader xmlReader = new XmlToCompositeNodeReader(); try { return xmlReader.read(entityStream); } catch (XMLStreamException | UnsupportedFormatException e) { - LOG.debug( "Error parsing json input", e ); - throw new RestconfDocumentedException( - "Error parsing input: " + e.getMessage(), - ErrorType.PROTOCOL, ErrorTag.MALFORMED_MESSAGE ); + LOG.debug("Error parsing json input", e); + throw new RestconfDocumentedException("Error parsing input: " + e.getMessage(), ErrorType.PROTOCOL, + ErrorTag.MALFORMED_MESSAGE); } } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlReader.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlToCompositeNodeReader.java similarity index 88% rename from opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlReader.java rename to opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlToCompositeNodeReader.java index 1d6ca15f3c..7d0690cdc2 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlReader.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/rest/impl/XmlToCompositeNodeReader.java @@ -28,19 +28,19 @@ import org.opendaylight.controller.sal.restconf.impl.NodeWrapper; import org.opendaylight.controller.sal.restconf.impl.SimpleNodeWrapper; import org.opendaylight.yangtools.yang.data.api.Node; -public class XmlReader { +public class XmlToCompositeNodeReader { private final static XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance(); private XMLEventReader eventReader; - public CompositeNodeWrapper read(InputStream entityStream) throws XMLStreamException, - UnsupportedFormatException, - IOException { - //Get an XML stream which can be marked, and reset, so we can check and see if there is - //any content being provided. + public CompositeNodeWrapper read(InputStream entityStream) throws XMLStreamException, UnsupportedFormatException, + IOException { + // Get an XML stream which can be marked, and reset, so we can check and + // see if there is + // any content being provided. entityStream = getMarkableStream(entityStream); - if( isInputStreamEmpty( entityStream ) ) { + if (isInputStreamEmpty(entityStream)) { return null; } @@ -103,24 +103,24 @@ public class XmlReader { } /** - * If the input stream is not markable, then it wraps the input stream with a buffered stream, - * which is mark able. That way we can check if the stream is empty safely. + * If the input stream is not markable, then it wraps the input stream with + * a buffered stream, which is mark able. That way we can check if the + * stream is empty safely. + * * @param entityStream * @return */ private InputStream getMarkableStream(InputStream entityStream) { - if( !entityStream.markSupported() ) - { - entityStream = new BufferedInputStream( entityStream ); + if (!entityStream.markSupported()) { + entityStream = new BufferedInputStream(entityStream); } return entityStream; } - private boolean isInputStreamEmpty(InputStream entityStream) - throws IOException { + private boolean isInputStreamEmpty(InputStream entityStream) throws IOException { boolean isEmpty = false; - entityStream.mark( 1 ); - if( entityStream.read() == -1 ){ + entityStream.mark(1); + if (entityStream.read() == -1) { isEmpty = true; } entityStream.reset(); @@ -131,7 +131,7 @@ public class XmlReader { checkArgument(event != null, "XML Event cannot be NULL!"); if (event.isStartElement()) { XMLEvent innerEvent = skipCommentsAndWhitespace(); - if ( innerEvent != null && (innerEvent.isCharacters() || innerEvent.isEndElement())) { + if (innerEvent != null && (innerEvent.isCharacters() || innerEvent.isEndElement())) { return true; } } @@ -142,7 +142,7 @@ public class XmlReader { checkArgument(event != null, "XML Event cannot be NULL!"); if (event.isStartElement()) { XMLEvent innerEvent = skipCommentsAndWhitespace(); - if( innerEvent != null ) { + if (innerEvent != null) { if (innerEvent.isStartElement()) { return true; } @@ -152,16 +152,16 @@ public class XmlReader { } private XMLEvent skipCommentsAndWhitespace() throws XMLStreamException { - while( eventReader.hasNext() ) { + while (eventReader.hasNext()) { XMLEvent event = eventReader.peek(); - if( event.getEventType() == XMLStreamConstants.COMMENT ) { + if (event.getEventType() == XMLStreamConstants.COMMENT) { eventReader.nextEvent(); continue; } - if( event.isCharacters() ) { + if (event.isCharacters()) { Characters chars = event.asCharacters(); - if( chars.isWhiteSpace() ) { + if (chars.isWhiteSpace()) { eventReader.nextEvent(); continue; } @@ -235,7 +235,8 @@ public class XmlReader { private Object resolveValueOfElement(String value, StartElement startElement) { // it could be instance-identifier Built-In Type if (value.startsWith("/")) { - IdentityValuesDTO iiValue = RestUtil.asInstanceIdentifier(value, new RestUtil.PrefixMapingFromXml(startElement)); + IdentityValuesDTO iiValue = RestUtil.asInstanceIdentifier(value, new RestUtil.PrefixMapingFromXml( + startElement)); if (iiValue != null) { return iiValue; } @@ -245,7 +246,7 @@ public class XmlReader { if (namespaceAndValue.length == 2) { String namespace = startElement.getNamespaceContext().getNamespaceURI(namespaceAndValue[0]); if (namespace != null && !namespace.isEmpty()) { - return new IdentityValuesDTO(namespace, namespaceAndValue[1], namespaceAndValue[0],value); + return new IdentityValuesDTO(namespace, namespaceAndValue[1], namespaceAndValue[0], value); } } // it is not "prefix:value" but just "value" diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java index 5a16c04aed..c8440c0a16 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/RestconfImpl.java @@ -15,7 +15,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; - import java.net.URI; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -26,14 +25,13 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.concurrent.Future; - import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriBuilder; import javax.ws.rs.core.UriInfo; - import org.apache.commons.lang3.StringUtils; import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.sal.core.api.mount.MountInstance; @@ -78,6 +76,21 @@ import org.opendaylight.yangtools.yang.parser.builder.impl.ContainerSchemaNodeBu import org.opendaylight.yangtools.yang.parser.builder.impl.LeafSchemaNodeBuilder; public class RestconfImpl implements RestconfService { + private enum UriParameters { + PRETTY_PRINT( "prettyPrint"), + DEPTH( "depth"); + + private String uriParameterName; + UriParameters(String uriParameterName) { + this.uriParameterName = uriParameterName; + } + + @Override + public String toString() { + return uriParameterName; + } + } + private final static RestconfImpl INSTANCE = new RestconfImpl(); private static final int CHAR_NOT_FOUND = -1; @@ -110,7 +123,7 @@ public class RestconfImpl implements RestconfService { } @Override - public StructuredData getModules() { + public StructuredData getModules(final UriInfo uriInfo) { final Module restconfModule = this.getRestconfModule(); final List> modulesAsData = new ArrayList>(); @@ -127,11 +140,11 @@ public class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); QName qName = modulesSchemaNode.getQName(); final CompositeNode modulesNode = NodeFactory.createImmutableCompositeNode(qName, null, modulesAsData); - return new StructuredData(modulesNode, modulesSchemaNode, null); + return new StructuredData(modulesNode, modulesSchemaNode, null,parsePrettyPrintParameter( uriInfo )); } @Override - public StructuredData getAvailableStreams() { + public StructuredData getAvailableStreams(final UriInfo uriInfo) { Set availableStreams = Notificator.getStreamNames(); final List> streamsAsData = new ArrayList>(); @@ -146,11 +159,11 @@ public class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.STREAMS_CONTAINER_SCHEMA_NODE); QName qName = streamsSchemaNode.getQName(); final CompositeNode streamsNode = NodeFactory.createImmutableCompositeNode(qName, null, streamsAsData); - return new StructuredData(streamsNode, streamsSchemaNode, null); + return new StructuredData(streamsNode, streamsSchemaNode, null,parsePrettyPrintParameter( uriInfo )); } @Override - public StructuredData getModules(final String identifier) { + public StructuredData getModules(final String identifier,final UriInfo uriInfo) { Set modules = null; MountInstance mountPoint = null; if (identifier.contains(ControllerContext.MOUNT)) { @@ -178,11 +191,11 @@ public class RestconfImpl implements RestconfService { restconfModule, Draft02.RestConfModule.MODULES_CONTAINER_SCHEMA_NODE); QName qName = modulesSchemaNode.getQName(); final CompositeNode modulesNode = NodeFactory.createImmutableCompositeNode(qName, null, modulesAsData); - return new StructuredData(modulesNode, modulesSchemaNode, mountPoint); + return new StructuredData(modulesNode, modulesSchemaNode, mountPoint,parsePrettyPrintParameter( uriInfo )); } @Override - public StructuredData getModule(final String identifier) { + public StructuredData getModule(final String identifier,final UriInfo uriInfo) { final QName moduleNameAndRevision = this.getModuleNameAndRevision(identifier); Module module = null; MountInstance mountPoint = null; @@ -207,17 +220,17 @@ public class RestconfImpl implements RestconfService { final DataSchemaNode moduleSchemaNode = controllerContext.getRestconfModuleRestConfSchemaNode( restconfModule, Draft02.RestConfModule.MODULE_LIST_SCHEMA_NODE); final CompositeNode moduleNode = this.toModuleCompositeNode(module, moduleSchemaNode); - return new StructuredData(moduleNode, moduleSchemaNode, mountPoint); + return new StructuredData(moduleNode, moduleSchemaNode, mountPoint,parsePrettyPrintParameter( uriInfo )); } @Override - public StructuredData getOperations() { + public StructuredData getOperations(final UriInfo uriInfo) { Set allModules = this.controllerContext.getAllModules(); - return this.operationsFromModulesToStructuredData(allModules, null); + return this.operationsFromModulesToStructuredData(allModules, null,parsePrettyPrintParameter(uriInfo)); } @Override - public StructuredData getOperations(final String identifier) { + public StructuredData getOperations(final String identifier,final UriInfo uriInfo) { Set modules = null; MountInstance mountPoint = null; if (identifier.contains(ControllerContext.MOUNT)) { @@ -232,11 +245,11 @@ public class RestconfImpl implements RestconfService { ControllerContext.MOUNT, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE ); } - return this.operationsFromModulesToStructuredData(modules, mountPoint); + return this.operationsFromModulesToStructuredData(modules, mountPoint,parsePrettyPrintParameter(uriInfo)); } private StructuredData operationsFromModulesToStructuredData(final Set modules, - final MountInstance mountPoint) { + final MountInstance mountPoint,boolean prettyPrint) { final List> operationsAsData = new ArrayList>(); Module restconfModule = this.getRestconfModule(); final DataSchemaNode operationsSchemaNode = controllerContext.getRestconfModuleRestConfSchemaNode( @@ -269,7 +282,7 @@ public class RestconfImpl implements RestconfService { final CompositeNode operationsNode = NodeFactory.createImmutableCompositeNode(qName, null, operationsAsData); ContainerSchemaNode schemaNode = fakeOperationsSchemaNode.build(); - return new StructuredData(operationsNode, schemaNode, mountPoint); + return new StructuredData(operationsNode, schemaNode, mountPoint,prettyPrint); } private Module getRestconfModule() { @@ -389,18 +402,18 @@ public class RestconfImpl implements RestconfService { } @Override - public StructuredData invokeRpc(final String identifier, final CompositeNode payload) { + public StructuredData invokeRpc(final String identifier, final CompositeNode payload,final UriInfo uriInfo) { final RpcExecutor rpc = this.resolveIdentifierInInvokeRpc(identifier); QName rpcName = rpc.getRpcDefinition().getQName(); URI rpcNamespace = rpcName.getNamespace(); if (Objects.equal(rpcNamespace.toString(), SAL_REMOTE_NAMESPACE) && Objects.equal(rpcName.getLocalName(), SAL_REMOTE_RPC_SUBSRCIBE)) { - return invokeSalRemoteRpcSubscribeRPC(payload, rpc.getRpcDefinition()); + return invokeSalRemoteRpcSubscribeRPC(payload, rpc.getRpcDefinition(),parsePrettyPrintParameter(uriInfo)); } validateInput( rpc.getRpcDefinition().getInput(), payload ); - return callRpc(rpc, payload); + return callRpc(rpc, payload,parsePrettyPrintParameter(uriInfo)); } private void validateInput(final DataSchemaNode inputSchema, final CompositeNode payload) { @@ -426,7 +439,7 @@ public class RestconfImpl implements RestconfService { } private StructuredData invokeSalRemoteRpcSubscribeRPC(final CompositeNode payload, - final RpcDefinition rpc) { + final RpcDefinition rpc,final boolean prettyPrint) { final CompositeNode value = this.normalizeNode(payload, rpc.getInput(), null); final SimpleNode pathNode = value == null ? null : value.getFirstSimpleByName( QName.create(rpc.getQName(), "path") ); @@ -463,16 +476,16 @@ public class RestconfImpl implements RestconfService { Notificator.createListener(pathIdentifier, streamName); } - return new StructuredData(responseData, rpc.getOutput(), null); + return new StructuredData(responseData, rpc.getOutput(), null,prettyPrint); } @Override - public StructuredData invokeRpc(final String identifier, final String noPayload) { + public StructuredData invokeRpc(final String identifier, final String noPayload, final UriInfo uriInfo) { if (StringUtils.isNotBlank(noPayload)) { throw new RestconfDocumentedException( "Content must be empty.", ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE ); } - return invokeRpc( identifier, (CompositeNode)null ); + return invokeRpc( identifier, (CompositeNode)null,uriInfo); } private RpcExecutor resolveIdentifierInInvokeRpc(final String identifier) { @@ -516,7 +529,7 @@ public class RestconfImpl implements RestconfService { } - private StructuredData callRpc(final RpcExecutor rpcExecutor, final CompositeNode payload) { + private StructuredData callRpc(final RpcExecutor rpcExecutor, final CompositeNode payload,boolean prettyPrint) { if (rpcExecutor == null) { throw new RestconfDocumentedException( "RPC does not exist.", ErrorType.RPC, ErrorTag.UNKNOWN_ELEMENT ); @@ -547,7 +560,7 @@ public class RestconfImpl implements RestconfService { return null; //no output, nothing to send back. } - return new StructuredData(rpcResult.getResult(), rpc.getOutput(), null); + return new StructuredData(rpcResult.getResult(), rpc.getOutput(), null,prettyPrint); } private void checkRpcSuccessAndThrowException(final RpcResult rpcResult) { @@ -570,7 +583,7 @@ public class RestconfImpl implements RestconfService { } @Override - public StructuredData readConfigurationData(final String identifier, final UriInfo info) { + public StructuredData readConfigurationData(final String identifier, final UriInfo uriInfo) { final InstanceIdWithSchemaNode iiWithData = this.controllerContext.toInstanceIdentifier(identifier); CompositeNode data = null; MountInstance mountPoint = iiWithData.getMountPoint(); @@ -581,8 +594,9 @@ public class RestconfImpl implements RestconfService { data = broker.readConfigurationData(iiWithData.getInstanceIdentifier()); } - data = pruneDataAtDepth( data, parseDepthParameter( info ) ); - return new StructuredData(data, iiWithData.getSchemaNode(), iiWithData.getMountPoint()); + data = pruneDataAtDepth( data, parseDepthParameter( uriInfo ) ); + boolean prettyPrintMode = parsePrettyPrintParameter( uriInfo ); + return new StructuredData(data, iiWithData.getSchemaNode(), iiWithData.getMountPoint(),prettyPrintMode); } @SuppressWarnings("unchecked") @@ -607,7 +621,7 @@ public class RestconfImpl implements RestconfService { } private Integer parseDepthParameter( final UriInfo info ) { - String param = info.getQueryParameters( false ).getFirst( "depth" ); + String param = info.getQueryParameters( false ).getFirst( UriParameters.DEPTH.toString() ); if( Strings.isNullOrEmpty( param ) || "unbounded".equals( param ) ) { return null; } @@ -643,7 +657,13 @@ public class RestconfImpl implements RestconfService { } data = pruneDataAtDepth( data, parseDepthParameter( info ) ); - return new StructuredData(data, iiWithData.getSchemaNode(), mountPoint); + boolean prettyPrintMode = parsePrettyPrintParameter( info ); + return new StructuredData(data, iiWithData.getSchemaNode(), mountPoint,prettyPrintMode); + } + + private boolean parsePrettyPrintParameter(UriInfo info) { + String param = info.getQueryParameters(false).getFirst(UriParameters.PRETTY_PRINT.toString()); + return Boolean.parseBoolean(param); } @Override @@ -858,7 +878,7 @@ public class RestconfImpl implements RestconfService { broker.registerToListenDataChanges(listener); final UriBuilder uriBuilder = uriInfo.getAbsolutePathBuilder(); - UriBuilder port = uriBuilder.port(WebSocketServer.PORT); + UriBuilder port = uriBuilder.port(WebSocketServer.getInstance().getPort()); final URI uriToWebsocketServer = port.replacePath(streamName).build(); return Response.status(Status.OK).location(uriToWebsocketServer).build(); @@ -1117,6 +1137,7 @@ public class RestconfImpl implements RestconfService { final DataNodeContainer schema, final MountInstance mountPoint, final QName currentAugment ) { final List> children = compositeNodeBuilder.getValues(); + checkNodeMultiplicityAccordingToSchema(schema,children); for (final NodeWrapper child : children) { final List potentialSchemaNodes = this.controllerContext.findInstanceDataChildrenByName( @@ -1177,6 +1198,29 @@ public class RestconfImpl implements RestconfService { } } + private void checkNodeMultiplicityAccordingToSchema(final DataNodeContainer dataNodeContainer, + final List> nodes) { + Map equalNodeNamesToCounts = new HashMap(); + for (NodeWrapper child : nodes) { + Integer count = equalNodeNamesToCounts.get(child.getLocalName()); + equalNodeNamesToCounts.put(child.getLocalName(), count == null ? 1 : ++count); + } + + for (DataSchemaNode childSchemaNode : dataNodeContainer.getChildNodes()) { + if (childSchemaNode instanceof ContainerSchemaNode || childSchemaNode instanceof LeafSchemaNode) { + String localName = childSchemaNode.getQName().getLocalName(); + Integer count = equalNodeNamesToCounts.get(localName); + if (count != null && count > 1) { + throw new RestconfDocumentedException( + "Multiple input data elements were specified for '" + + childSchemaNode.getQName().getLocalName() + + "'. The data for this element type can only be specified once.", + ErrorType.APPLICATION, ErrorTag.BAD_ELEMENT); + } + } + } + } + private QName normalizeNodeName(final NodeWrapper nodeBuilder, final DataSchemaNode schema, final QName previousAugment, final MountInstance mountPoint) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/StructuredData.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/StructuredData.java index 231fe7e02e..c745a8009d 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/StructuredData.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/restconf/impl/StructuredData.java @@ -16,11 +16,18 @@ public class StructuredData { private final CompositeNode data; private final DataSchemaNode schema; private final MountInstance mountPoint; + private final boolean prettyPrintMode; public StructuredData(final CompositeNode data, final DataSchemaNode schema, final MountInstance mountPoint) { + this(data, schema, mountPoint, false); + } + + public StructuredData(final CompositeNode data, final DataSchemaNode schema, final MountInstance mountPoint, + final boolean preattyPrintMode) { this.data = data; this.schema = schema; this.mountPoint = mountPoint; + this.prettyPrintMode = preattyPrintMode; } public CompositeNode getData() { @@ -34,4 +41,8 @@ public class StructuredData { public MountInstance getMountPoint() { return mountPoint; } + + public boolean isPrettyPrintMode() { + return prettyPrintMode; + } } diff --git a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java index fcfa8858ee..20951b01e2 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java +++ b/opendaylight/md-sal/sal-rest-connector/src/main/java/org/opendaylight/controller/sal/streams/websockets/WebSocketServer.java @@ -10,18 +10,69 @@ import org.opendaylight.controller.sal.streams.listeners.Notificator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Preconditions; + /** - * {@link WebSocketServer} is responsible to start and stop web socket server at - * {@link #PORT}. + * {@link WebSocketServer} is responsible to start and stop web socket server */ public class WebSocketServer implements Runnable { private static final Logger logger = LoggerFactory .getLogger(WebSocketServer.class); - - public static final int PORT = 8181; + public static final String WEBSOCKET_SERVER_CONFIG_PROPERTY = "restconf.websocket.port"; + public static final int DEFAULT_PORT = 8181; private EventLoopGroup bossGroup; private EventLoopGroup workerGroup; + private static WebSocketServer singleton = null; + private int port = DEFAULT_PORT; + + private WebSocketServer(int port) { + this.port = port; + } + + /** + * Create instance of {@link WebSocketServer} + * @param port TCP port used for this server + * @return instance of {@link WebSocketServer} + */ + public static WebSocketServer createInstance(int port) { + if(singleton != null) { + throw new IllegalStateException("createInstance() has already been called"); + } + if(port < 1024) { + throw new IllegalArgumentException("Privileged port (below 1024) is not allowed"); + } + singleton = new WebSocketServer(port); + return singleton; + } + + /** + * Return websocket TCP port + */ + public int getPort() { + return port; + } + + /** + * Get instance of {@link WebSocketServer} created by {@link #createInstance(int)} + * @return instance of {@link WebSocketServer} + */ + public static WebSocketServer getInstance() { + Preconditions.checkNotNull(singleton, + "createInstance() must be called prior to getInstance()"); + return singleton; + } + + /** + * Destroy this already created instance + */ + public static void destroyInstance() { + if(singleton == null) { + throw new IllegalStateException( + "createInstance() must be called prior to destroyInstance()"); + } + getInstance().stop(); + } @Override public void run() { @@ -33,8 +84,8 @@ public class WebSocketServer implements Runnable { .channel(NioServerSocketChannel.class) .childHandler(new WebSocketServerInitializer()); - Channel ch = b.bind(PORT).sync().channel(); - logger.info("Web socket server started at port {}.", PORT); + Channel ch = b.bind(port).sync().channel(); + logger.info("Web socket server started at port {}.", port); ch.closeFuture().sync(); } catch (InterruptedException e) { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonNotExistingLeafTypeTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonNotExistingLeafTypeTest.java index 24dba17c90..3f89c97367 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonNotExistingLeafTypeTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonNotExistingLeafTypeTest.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.sal.restconf.impl.cnsn.to.json.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.controller.sal.restconf.impl.test.TestUtils.containsStringData; import java.io.IOException; import java.util.Collections; @@ -50,7 +51,9 @@ public class CnSnToJsonNotExistingLeafTypeTest extends YangAndXmlAndDataSchemaLo Collections.emptySet(), prepareDataSchemaNode(), StructuredDataToJsonProvider.INSTANCE); assertNotNull(jsonOutput); - assertTrue(jsonOutput.contains("\"lf1\": \"\"")); + +// pattern for e.g. > "lf1" : "" < or >"lf1":""< + assertTrue(containsStringData(jsonOutput, "\"lf1\"",":","\"\"")); } private CompositeNode prepareCompositeNode() { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithAugmentTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithAugmentTest.java index e116129bf7..3d25955b3c 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithAugmentTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/cnsn/to/json/test/CnSnToJsonWithAugmentTest.java @@ -9,11 +9,10 @@ package org.opendaylight.controller.sal.restconf.impl.cnsn.to.json.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.controller.sal.restconf.impl.test.TestUtils.containsStringData; import java.io.IOException; - import javax.ws.rs.WebApplicationException; - import org.junit.BeforeClass; import org.junit.Test; import org.opendaylight.controller.sal.rest.impl.StructuredDataToJsonProvider; @@ -47,12 +46,12 @@ public class CnSnToJsonWithAugmentTest extends YangAndXmlAndDataSchemaLoader { } assertNotNull(jsonOutput); - assertTrue(jsonOutput.contains("\"augment-leaf:lf2\": \"lf2\"")); - assertTrue(jsonOutput.contains("\"augment-container:cont1\": {")); - assertTrue(jsonOutput.contains("\"augment-container:lf11\": \"lf11\"")); - assertTrue(jsonOutput.contains("\"augment-list:lst1\": [")); - assertTrue(jsonOutput.contains("\"augment-list:lf11\": \"lf1_1\"")); - assertTrue(jsonOutput.contains("\"augment-list:lf11\": \"lf1_2\"")); - assertTrue(jsonOutput.contains("\"augment-leaflist:lflst1\": [")); + assertTrue(containsStringData(jsonOutput,"\"augment-leaf:lf2\"",":", "\"lf2\"")); + assertTrue(containsStringData(jsonOutput,"\"augment-container:cont1\"",":", "\\{")); + assertTrue(containsStringData(jsonOutput,"\"augment-container:lf11\"",":", "\"lf11\"")); + assertTrue(containsStringData(jsonOutput,"\"augment-list:lst1\"",":", "\\[")); + assertTrue(containsStringData(jsonOutput,"\"augment-list:lf11\"",":", "\"lf1_1\"")); + assertTrue(containsStringData(jsonOutput,"\"augment-list:lf11\"",":", "\"lf1_2\"")); + assertTrue(containsStringData(jsonOutput,"\"augment-leaflist:lflst1\"",":", "\\[")); } } diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java index 3f2c212bd8..47171bf247 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/CnSnToXmlAndJsonInstanceIdentifierTest.java @@ -9,6 +9,7 @@ package org.opendaylight.controller.sal.restconf.impl.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.controller.sal.restconf.impl.test.TestUtils.containsStringData; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -19,16 +20,13 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; - import javax.ws.rs.WebApplicationException; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; - import org.junit.BeforeClass; -import org.junit.Ignore; import org.junit.Test; import org.opendaylight.controller.sal.rest.impl.StructuredDataToJsonProvider; import org.opendaylight.controller.sal.rest.impl.StructuredDataToXmlProvider; @@ -39,9 +37,10 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifie import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeIdentifierWithPredicates; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.NodeWithValue; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier.PathArgument; -import org.opendaylight.yangtools.yang.data.api.MutableCompositeNode; -import org.opendaylight.yangtools.yang.data.api.MutableSimpleNode; +import org.opendaylight.yangtools.yang.data.api.SimpleNode; +import org.opendaylight.yangtools.yang.data.impl.ImmutableCompositeNode; import org.opendaylight.yangtools.yang.data.impl.NodeFactory; +import org.opendaylight.yangtools.yang.data.impl.util.CompositeNodeBuilder; public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSchemaLoader { @@ -55,21 +54,16 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch CompositeNode cnSn = prepareCnSn(createInstanceIdentifier()); String output = TestUtils.writeCompNodeWithSchemaContextToOutput(cnSn, modules, dataSchemaNode, StructuredDataToXmlProvider.INSTANCE); - //uncomment for debug - // System.out.println(output); validateXmlOutput(output); } - @Ignore @Test public void saveCnSnWithLeafListInstIdentifierToXmlTest() throws WebApplicationException, IOException, - URISyntaxException, XMLStreamException { + URISyntaxException, XMLStreamException { CompositeNode cnSn = prepareCnSn(createInstanceIdentifierWithLeafList()); String output = TestUtils.writeCompNodeWithSchemaContextToOutput(cnSn, modules, dataSchemaNode, StructuredDataToXmlProvider.INSTANCE); - //uncomment for debug - // System.out.println(output); validateXmlOutputWithLeafList(output); } @@ -79,33 +73,40 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch String output = TestUtils.writeCompNodeWithSchemaContextToOutput(cnSn, modules, dataSchemaNode, StructuredDataToJsonProvider.INSTANCE); boolean strInOutput = false; - strInOutput = output - .contains("\"augment-augment-module:lf111\": \"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module:lst11[augment-module:keyvalue111=\\\"value1\\\"][augment-module:keyvalue112=\\\"value2\\\"]/augment-augment-module:lf112\""); + strInOutput = containsStringData( + output, + "\"augment-augment-module:lf111\"", + ":", + "\"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module:lst11\\[augment-module:keyvalue111=\\\\\"value1\\\\\"\\]\\[augment-module:keyvalue112=\\\\\"value2\\\\\"\\]/augment-augment-module:lf112\""); if (!strInOutput) { - strInOutput = output - .contains("\"augment-augment-module:lf111\": \"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module:lst11[augment-module:keyvalue111='value1'][augment-module:keyvalue112='value2']/augment-augment-module:lf112\""); + strInOutput = containsStringData( + output, + "\"augment-augment-module:lf111\"", + ":", + "\"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module:lst11\\[augment-module:keyvalue111='value1'\\]\\[augment-module:keyvalue112='value2'\\]/augment-augment-module:lf112\""); } - //uncomment for debug - // System.out.println(output); assertTrue(strInOutput); } - @Test public void saveCnSnWithLeafListInstIdentifierToJsonTest() throws WebApplicationException, IOException, - URISyntaxException { + URISyntaxException { CompositeNode cnSn = prepareCnSn(createInstanceIdentifierWithLeafList()); String output = TestUtils.writeCompNodeWithSchemaContextToOutput(cnSn, modules, dataSchemaNode, StructuredDataToJsonProvider.INSTANCE); - //uncomment for debug - // System.out.println(output); boolean strInOutput = false; - strInOutput = output - .contains("\"augment-augment-module:lf111\": \"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module-leaf-list:lflst11[.='lflst11_1']\""); + strInOutput = containsStringData( + output, + "\"augment-augment-module:lf111\"", + ":", + "\"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module-leaf-list:lflst11\\[.='lflst11_1'\\]\""); if (!strInOutput) { - strInOutput = output - .contains("\"augment-augment-module:lf111\": \"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module-leaf-list:lflst11[.=\\\"lflst11_1\\\"]\""); + strInOutput = containsStringData( + output, + "\"augment-augment-module:lf111\"", + ":", + "\"/instance-identifier-module:cont/instance-identifier-module:cont1/augment-module-leaf-list:lflst11\\[.=\\\\\"lflst11_1\\\\\"\\]\""); } assertTrue(strInOutput); @@ -189,27 +190,21 @@ public class CnSnToXmlAndJsonInstanceIdentifierTest extends YangAndXmlAndDataSch } private CompositeNode prepareCnSn(final InstanceIdentifier instanceIdentifier) throws URISyntaxException { - MutableCompositeNode cont = NodeFactory.createMutableCompositeNode( - TestUtils.buildQName("cont", "instance:identifier:module", "2014-01-17"), null, null,null,null); - MutableCompositeNode cont1 = NodeFactory.createMutableCompositeNode( - TestUtils.buildQName("cont1", "instance:identifier:module", "2014-01-17"), cont, null,null,null); - MutableCompositeNode lst11 = NodeFactory.createMutableCompositeNode( - TestUtils.buildQName("lst11", "augment:module", "2014-01-17"), cont1, null,null,null); - - MutableSimpleNode lf111 = NodeFactory.createMutableSimpleNode(TestUtils.buildQName("lf111", "augment:augment:module", "2014-01-17"), - lst11, instanceIdentifier,null,null); - - - lst11.getValue().add(lf111); - lst11.init(); + CompositeNodeBuilder cont = ImmutableCompositeNode.builder(); + cont.setQName(QName.create("instance:identifier:module", "2014-01-17", "cont")); - cont1.getValue().add(lst11); - cont1.init(); + CompositeNodeBuilder cont1 = ImmutableCompositeNode.builder(); + cont1.setQName(QName.create("instance:identifier:module", "2014-01-17", "cont1")); - cont.getValue().add(cont1); - cont.init(); + CompositeNodeBuilder lst11 = ImmutableCompositeNode.builder(); + lst11.setQName(QName.create("augment:module", "2014-01-17", "lst11")); - return cont; + SimpleNode lf111 = NodeFactory.createImmutableSimpleNode( + QName.create("augment:augment:module", "2014-01-17", "lf111"), null, instanceIdentifier); + lst11.add(lf111); + cont1.add(lst11.toInstance()); + cont.add(cont1.toInstance()); + return cont.toInstance(); } private InstanceIdentifier createInstanceIdentifier() throws URISyntaxException { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java index 910ca8e20a..b90097bc94 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/InvokeRpcMethodTest.java @@ -19,6 +19,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; @@ -27,7 +30,9 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; - +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.UriInfo; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; @@ -56,14 +61,11 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - public class InvokeRpcMethodTest { private RestconfImpl restconfImpl = null; private static ControllerContext controllerContext = null; + private static UriInfo uriInfo; @BeforeClass @@ -77,7 +79,10 @@ public class InvokeRpcMethodTest { SchemaContext schemaContext = TestUtils.loadSchemaContext(allModules); controllerContext = spy( ControllerContext.getInstance() ); controllerContext.setSchemas(schemaContext); - + uriInfo = mock(UriInfo.class); + MultivaluedMap map = new MultivaluedHashMap<>(); + map.put("prettyPrint", Collections.singletonList("true")); + when(uriInfo.getQueryParameters(any(Boolean.class))).thenReturn(map); } @Before @@ -114,7 +119,7 @@ public class InvokeRpcMethodTest { .thenReturn( Futures.>immediateFuture( Rpcs.getRpcResult( true ) ) ); - StructuredData structData = restconf.invokeRpc("invoke-rpc-module:rpc-test", payload); + StructuredData structData = restconf.invokeRpc("invoke-rpc-module:rpc-test", payload,uriInfo); assertTrue(structData == null); } @@ -143,7 +148,7 @@ public class InvokeRpcMethodTest { restconfImpl.setBroker(brokerFacade); try { - restconfImpl.invokeRpc("toaster:cancel-toast", ""); + restconfImpl.invokeRpc("toaster:cancel-toast", "",uriInfo); fail("Expected an exception to be thrown."); } catch (RestconfDocumentedException e) { @@ -196,7 +201,7 @@ public class InvokeRpcMethodTest { restconfImpl.setBroker(brokerFacade); try { - restconfImpl.invokeRpc("toaster:cancel-toast", ""); + restconfImpl.invokeRpc("toaster:cancel-toast", "",uriInfo); fail("Expected an exception to be thrown."); } catch (RestconfDocumentedException e) { @@ -220,7 +225,7 @@ public class InvokeRpcMethodTest { restconfImpl.setBroker(brokerFacade); StructuredData output = restconfImpl.invokeRpc("toaster:cancel-toast", - ""); + "",uriInfo); assertEquals(null, output); //additional validation in the fact that the restconfImpl does not throw an exception. } @@ -228,7 +233,7 @@ public class InvokeRpcMethodTest { @Test public void testInvokeRpcMethodExpectingNoPayloadButProvidePayload() { try { - restconfImpl.invokeRpc("toaster:cancel-toast", " a payload "); + restconfImpl.invokeRpc("toaster:cancel-toast", " a payload ",uriInfo); fail("Expected an exception"); } catch (RestconfDocumentedException e) { verifyRestconfDocumentedException( e, 0, ErrorType.PROTOCOL, ErrorTag.INVALID_VALUE, @@ -239,7 +244,7 @@ public class InvokeRpcMethodTest { @Test public void testInvokeRpcMethodWithBadMethodName() { try { - restconfImpl.invokeRpc("toaster:bad-method", ""); + restconfImpl.invokeRpc("toaster:bad-method", "",uriInfo); fail("Expected an exception"); } catch (RestconfDocumentedException e) { @@ -263,7 +268,7 @@ public class InvokeRpcMethodTest { restconfImpl.setBroker(brokerFacade); StructuredData output = restconfImpl.invokeRpc("toaster:make-toast", - payload); + payload,uriInfo); assertEquals(null, output); //additional validation in the fact that the restconfImpl does not throw an exception. } @@ -271,7 +276,7 @@ public class InvokeRpcMethodTest { @Test public void testThrowExceptionWhenSlashInModuleName() { try { - restconfImpl.invokeRpc("toaster/slash", ""); + restconfImpl.invokeRpc("toaster/slash", "",uriInfo); fail("Expected an exception."); } catch (RestconfDocumentedException e) { @@ -294,7 +299,7 @@ public class InvokeRpcMethodTest { restconfImpl.setBroker(brokerFacade); - StructuredData output = restconfImpl.invokeRpc("toaster:testOutput", ""); + StructuredData output = restconfImpl.invokeRpc("toaster:testOutput", "",uriInfo); assertNotNull( output ); assertSame( compositeNode, output.getData() ); assertNotNull( output.getSchema() ); @@ -330,7 +335,7 @@ public class InvokeRpcMethodTest { restconfImpl.setControllerContext( mockedContext ); StructuredData output = restconfImpl.invokeRpc( "opendaylight-inventory:nodes/node/REMOTE_HOST/yang-ext:mount/toaster:cancel-toast", - ""); + "",uriInfo); assertEquals(null, output); //additional validation in the fact that the restconfImpl does not throw an exception. diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java index 319603dfc1..3dd3101a2e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MediaTypesTest.java @@ -19,12 +19,10 @@ import static org.opendaylight.controller.sal.restconf.impl.test.RestOperationUt import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; - import javax.ws.rs.client.Entity; import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; - import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.BeforeClass; @@ -55,10 +53,10 @@ public class MediaTypesTest extends JerseyTest { @Override protected Application configure() { /* enable/disable Jersey logs to console */ -// enable(TestProperties.LOG_TRAFFIC); -// enable(TestProperties.DUMP_ENTITY); -// enable(TestProperties.RECORD_LOG_LEVEL); -// set(TestProperties.RECORD_LOG_LEVEL, Level.ALL.intValue()); + // enable(TestProperties.LOG_TRAFFIC); + // enable(TestProperties.DUMP_ENTITY); + // enable(TestProperties.RECORD_LOG_LEVEL); + // set(TestProperties.RECORD_LOG_LEVEL, Level.ALL.intValue()); ResourceConfig resourceConfig = new ResourceConfig(); resourceConfig = resourceConfig.registerInstances(restconfService, StructuredDataToXmlProvider.INSTANCE, StructuredDataToJsonProvider.INSTANCE, XmlToCompositeNodeProvider.INSTANCE, @@ -66,31 +64,31 @@ public class MediaTypesTest extends JerseyTest { return resourceConfig; } - @Test - public void testPostOperationsWithInputDataMediaTypes() throws UnsupportedEncodingException { - String uriPrefix = "/operations/"; - String uriPath = "ietf-interfaces:interfaces"; - String uri = uriPrefix + uriPath; - when(restconfService.invokeRpc(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - post(uri, Draft02.MediaTypes.OPERATION+JSON, Draft02.MediaTypes.OPERATION+JSON, jsonData); - verify(restconfService, times(1)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, Draft02.MediaTypes.OPERATION+XML, Draft02.MediaTypes.OPERATION+XML, xmlData); - verify(restconfService, times(2)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON, jsonData); - verify(restconfService, times(3)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.APPLICATION_XML, MediaType.APPLICATION_XML, xmlData); - verify(restconfService, times(4)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.TEXT_XML, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(5)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, null, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - - // negative tests - post(uri, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - post(uri, MediaType.TEXT_XML, MediaType.TEXT_PLAIN, xmlData); - verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class)); - } + @Test + public void testPostOperationsWithInputDataMediaTypes() throws UnsupportedEncodingException { + String uriPrefix = "/operations/"; + String uriPath = "ietf-interfaces:interfaces"; + String uri = uriPrefix + uriPath; + when(restconfService.invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class))).thenReturn(null); + post(uri, Draft02.MediaTypes.OPERATION + JSON, Draft02.MediaTypes.OPERATION + JSON, jsonData); + verify(restconfService, times(1)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, Draft02.MediaTypes.OPERATION + XML, Draft02.MediaTypes.OPERATION + XML, xmlData); + verify(restconfService, times(2)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON, jsonData); + verify(restconfService, times(3)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.APPLICATION_XML, MediaType.APPLICATION_XML, xmlData); + verify(restconfService, times(4)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.TEXT_XML, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(5)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, null, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + + // negative tests + post(uri, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + post(uri, MediaType.TEXT_XML, MediaType.TEXT_PLAIN, xmlData); + verify(restconfService, times(6)).invokeRpc(eq(uriPath), any(CompositeNode.class), any(UriInfo.class)); + } @Test public void testGetConfigMediaTypes() throws UnsupportedEncodingException { @@ -98,9 +96,9 @@ public class MediaTypesTest extends JerseyTest { String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.readConfigurationData(eq(uriPath), any(UriInfo.class))).thenReturn(null); - get(uri, Draft02.MediaTypes.DATA+JSON); + get(uri, Draft02.MediaTypes.DATA + JSON); verify(restconfService, times(1)).readConfigurationData(eq(uriPath), any(UriInfo.class)); - get(uri, Draft02.MediaTypes.DATA+XML); + get(uri, Draft02.MediaTypes.DATA + XML); verify(restconfService, times(2)).readConfigurationData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_JSON); verify(restconfService, times(3)).readConfigurationData(eq(uriPath), any(UriInfo.class)); @@ -120,9 +118,9 @@ public class MediaTypesTest extends JerseyTest { String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.readOperationalData(eq(uriPath), any(UriInfo.class))).thenReturn(null); - get(uri, Draft02.MediaTypes.DATA+JSON); + get(uri, Draft02.MediaTypes.DATA + JSON); verify(restconfService, times(1)).readOperationalData(eq(uriPath), any(UriInfo.class)); - get(uri, Draft02.MediaTypes.DATA+XML); + get(uri, Draft02.MediaTypes.DATA + XML); verify(restconfService, times(2)).readOperationalData(eq(uriPath), any(UriInfo.class)); get(uri, MediaType.APPLICATION_JSON); verify(restconfService, times(3)).readOperationalData(eq(uriPath), any(UriInfo.class)); @@ -142,9 +140,9 @@ public class MediaTypesTest extends JerseyTest { String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.updateConfigurationData(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - put(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + put(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); - put(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + put(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); put(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).updateConfigurationData(eq(uriPath), any(CompositeNode.class)); @@ -162,9 +160,9 @@ public class MediaTypesTest extends JerseyTest { String uriPath = "ietf-interfaces:interfaces"; String uri = uriPrefix + uriPath; when(restconfService.createConfigurationData(eq(uriPath), any(CompositeNode.class))).thenReturn(null); - post(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + post(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); - post(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + post(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); post(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).createConfigurationData(eq(uriPath), any(CompositeNode.class)); @@ -181,9 +179,9 @@ public class MediaTypesTest extends JerseyTest { String uriPrefix = "/config/"; String uri = uriPrefix; when(restconfService.createConfigurationData(any(CompositeNode.class))).thenReturn(null); - post(uri, null, Draft02.MediaTypes.DATA+JSON, jsonData); + post(uri, null, Draft02.MediaTypes.DATA + JSON, jsonData); verify(restconfService, times(1)).createConfigurationData(any(CompositeNode.class)); - post(uri, null, Draft02.MediaTypes.DATA+XML, xmlData); + post(uri, null, Draft02.MediaTypes.DATA + XML, xmlData); verify(restconfService, times(2)).createConfigurationData(any(CompositeNode.class)); post(uri, null, MediaType.APPLICATION_JSON, jsonData); verify(restconfService, times(3)).createConfigurationData(any(CompositeNode.class)); diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java new file mode 100644 index 0000000000..42131026a5 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/MultipleEqualNamesForDataNodesTest.java @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.sal.restconf.impl.test; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + +import java.util.List; +import java.util.Set; +import javax.ws.rs.ext.MessageBodyReader; +import org.junit.Test; +import org.opendaylight.controller.sal.rest.impl.JsonToCompositeNodeProvider; +import org.opendaylight.controller.sal.rest.impl.XmlToCompositeNodeProvider; +import org.opendaylight.controller.sal.restconf.impl.RestconfDocumentedException; +import org.opendaylight.controller.sal.restconf.impl.RestconfError; +import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorTag; +import org.opendaylight.controller.sal.restconf.impl.RestconfError.ErrorType; +import org.opendaylight.yangtools.yang.data.api.CompositeNode; +import org.opendaylight.yangtools.yang.model.api.Module; + +/** + * If more then one data element with equal name exists where container or + * leaf schema node should be present the RestconfDocumentedException has to + * be raised + * + * Tests for BUG 1204 + */ +public class MultipleEqualNamesForDataNodesTest { + + @Test + public void multipleEqualNameDataNodeTestForContainerJsonTest() { + multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-container.json", ErrorType.APPLICATION, + ErrorTag.BAD_ELEMENT,JsonToCompositeNodeProvider.INSTANCE); + } + + @Test + public void multipleEqualNameDataNodeTestForLeafJsonTest() { + multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-leaf.json", ErrorType.PROTOCOL, + ErrorTag.MALFORMED_MESSAGE,JsonToCompositeNodeProvider.INSTANCE); + } + + @Test + public void multipleEqualNameDataNodeTestForContainerXmlTest() { + multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-container.xml", ErrorType.APPLICATION, + ErrorTag.BAD_ELEMENT,XmlToCompositeNodeProvider.INSTANCE); + } + + @Test + public void multipleEqualNameDataNodeTestForLeafXmlTest() { + multipleEqualNameDataNodeTest("/equal-data-node-names/equal-name-data-for-leaf.xml", ErrorType.APPLICATION, + ErrorTag.BAD_ELEMENT,XmlToCompositeNodeProvider.INSTANCE); + } + + private void multipleEqualNameDataNodeTest(String path, ErrorType errorType, ErrorTag errorTag,MessageBodyReader messageBodyReader) { + try { + CompositeNode compositeNode = TestUtils.readInputToCnSn(path, false,messageBodyReader); + assertNotNull(compositeNode); + + Set modules = null; + modules = TestUtils.loadModulesFrom("/equal-data-node-names/yang"); + assertNotNull(modules); + + TestUtils.normalizeCompositeNode(compositeNode, modules, "equal-data-node-names" + ":" + "cont"); + fail("Exception RestconfDocumentedException should be raised"); + } catch (RestconfDocumentedException e) { + List errors = e.getErrors(); + assertNotNull(errors); + + assertEquals(1, errors.size()); + + RestconfError restconfError = errors.get(0); + + assertEquals(errorType, restconfError.getErrorType()); + assertEquals(errorTag, restconfError.getErrorTag()); + } + } + +} diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java index 41a1c3827d..9fd5128d19 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/RestGetOperationTest.java @@ -8,6 +8,7 @@ package org.opendaylight.controller.sal.restconf.impl.test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -16,6 +17,8 @@ import static org.mockito.Matchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.UnsupportedEncodingException; @@ -29,14 +32,12 @@ import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; - import javax.ws.rs.core.Application; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedHashMap; import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.test.JerseyTest; import org.junit.BeforeClass; @@ -68,9 +69,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - public class RestGetOperationTest extends JerseyTest { static class NodeData { @@ -615,6 +613,39 @@ public class RestGetOperationTest extends JerseyTest { return null; } + /** + * If includeWhiteChars URI parameter is set to false then no white + * characters can be included in returned output + * @throws UnsupportedEncodingException + */ + @Test + public void getDataWithUriIncludeWhiteCharsParameterTest() throws UnsupportedEncodingException { + getDataWithUriIncludeWhiteCharsParameter("config"); + getDataWithUriIncludeWhiteCharsParameter("operational"); + } + + + private void getDataWithUriIncludeWhiteCharsParameter(String target) throws UnsupportedEncodingException { + mockReadConfigurationDataMethod(); + String uri = "/"+target+"/ietf-interfaces:interfaces/interface/eth0"; + Response response = target(uri).queryParam("prettyPrint", "false").request("application/xml").get(); + String xmlData = response.readEntity(String.class); + + Pattern pattern = Pattern.compile(".*(>\\s+|\\s+<).*", Pattern.DOTALL); + Matcher matcher = pattern.matcher(xmlData); + // XML element can't surrounded with white character (e.g "> " or + // " <") + assertFalse(matcher.matches()); + + response = target(uri).queryParam("prettyPrint", "false").request("application/json").get(); + String jsonData = response.readEntity(String.class); + pattern = Pattern.compile(".*(\\}\\s+|\\s+\\{|\\]\\s+|\\s+\\[|\\s+:|:\\s+).*", Pattern.DOTALL); + matcher = pattern.matcher(jsonData); + // JSON element can't surrounded with white character (e.g "} ", " {", + // "] ", " [", " :" or ": ") + assertFalse(matcher.matches()); + } + @Test public void getDataWithUriDepthParameterTest() throws UnsupportedEncodingException { diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java index 853c19f935..449b79923e 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java +++ b/opendaylight/md-sal/sal-rest-connector/src/test/java/org/opendaylight/controller/sal/restconf/impl/test/TestUtils.java @@ -13,6 +13,7 @@ import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import com.google.common.base.Preconditions; import java.io.BufferedReader; import java.io.ByteArrayOutputStream; import java.io.File; @@ -27,7 +28,8 @@ import java.sql.Date; import java.util.ArrayList; import java.util.List; import java.util.Set; - +import java.util.regex.Matcher; +import java.util.regex.Pattern; import javax.ws.rs.WebApplicationException; import javax.ws.rs.ext.MessageBodyReader; import javax.ws.rs.ext.MessageBodyWriter; @@ -40,7 +42,6 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.sal.restconf.impl.BrokerFacade; import org.opendaylight.controller.sal.restconf.impl.CompositeNodeWrapper; @@ -61,8 +62,6 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Document; import org.xml.sax.SAXException; -import com.google.common.base.Preconditions; - public final class TestUtils { private static final Logger LOG = LoggerFactory.getLogger(TestUtils.class); @@ -297,6 +296,22 @@ public final class TestUtils { } bufReader.close(); return result.toString(); + } + + private static Pattern patternForStringsSeparatedByWhiteChars(String ... substrings ) { + StringBuilder pattern = new StringBuilder(); + pattern.append(".*"); + for (String substring : substrings) { + pattern.append(substring); + pattern.append("\\s*"); + } + pattern.append(".*"); + return Pattern.compile(pattern.toString(), Pattern.DOTALL); + } + public static boolean containsStringData(String jsonOutput,String ...substrings ) { + Pattern pattern = patternForStringsSeparatedByWhiteChars(substrings); + Matcher matcher = pattern.matcher(jsonOutput); + return matcher.matches(); } } diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.json new file mode 100644 index 0000000000..78b097d8e8 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.json @@ -0,0 +1,16 @@ +{ + "cont":{ + "cont1":[ + { + "lst11":{ + "lf111":"value1" + } + }, + { + "lst11":{ + "lf111":"value2" + } + } + ] + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml new file mode 100644 index 0000000000..26a1f5f21d --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-container.xml @@ -0,0 +1,12 @@ + + + + value1 + + + + + value1 + + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json new file mode 100644 index 0000000000..d0a9fd4d3a --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.json @@ -0,0 +1,15 @@ +{ + "cont":{ + "cont1":{ + "lst11":[ + { + "lf111":"value1", + "lf111":"value2" + }, + { + "lf111":"value3" + } + ] + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml new file mode 100644 index 0000000000..4221c2d5a7 --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/equal-name-data-for-leaf.xml @@ -0,0 +1,11 @@ + + + + value1, + value2, + + + value3, + + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang new file mode 100644 index 0000000000..3a3653a12b --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/equal-data-node-names/yang/equal-data-node-names.yang @@ -0,0 +1,18 @@ +/* bug 1204 */ +module equal-data-node-names { + namespace "ns:equal:data:node:names"; + + prefix "eqdanona"; + revision 2014-06-26 { + } + + container cont { + container cont1 { + list lst11 { + leaf lf111 { + type string; + } + } + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json index 10d964d644..b886fc9da9 100644 --- a/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/json-to-cnsn/empty-data1.json @@ -1,5 +1,5 @@ { - "cont": { - "lf": - } + "cont": { + "lf": + } } \ No newline at end of file diff --git a/opendaylight/md-sal/sal-rest-connector/src/test/resources/multiple-nodes/multiple-nodes.yang b/opendaylight/md-sal/sal-rest-connector/src/test/resources/multiple-nodes/multiple-nodes.yang new file mode 100644 index 0000000000..22a1dae8ac --- /dev/null +++ b/opendaylight/md-sal/sal-rest-connector/src/test/resources/multiple-nodes/multiple-nodes.yang @@ -0,0 +1,17 @@ +module multiple-nodes { + namespace "multiple:nodes"; + prefix "mod1"; + revision "2014-06-23"; + + container cont { + container cont1 { + leaf lf11 { + type string; + } + } + + leaf lf1 { + type string; + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-test-model/pom.xml b/opendaylight/md-sal/sal-test-model/pom.xml new file mode 100644 index 0000000000..11a0ef211a --- /dev/null +++ b/opendaylight/md-sal/sal-test-model/pom.xml @@ -0,0 +1,81 @@ + + + + sal-parent + org.opendaylight.controller + 1.1-SNAPSHOT + + 4.0.0 + + + + org.opendaylight.yangtools + yang-binding + + + org.opendaylight.yangtools.model + yang-ext + + + + sal-test-model + + + + org.jacoco + jacoco-maven-plugin + + + org.opendaylight.controller.* + + + + + pre-test + + prepare-agent + + + + post-test + + report + + test + + + + + org.opendaylight.yangtools + yang-maven-plugin + + + + generate-sources + + + + + + org.opendaylight.yangtools.maven.sal.api.gen.plugin.CodeGeneratorImpl + + ${salGeneratorPath} + + + true + + + + + + + + scm:git:ssh://git.opendaylight.org:29418/controller.git + scm:git:ssh://git.opendaylight.org:29418/controller.git + HEAD + https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL + + + \ No newline at end of file diff --git a/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java b/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java new file mode 100644 index 0000000000..a0c23aecb4 --- /dev/null +++ b/opendaylight/md-sal/sal-test-model/src/main/java/org/opendaylight/controller/md/sal/test/model/util/ListsBindingUtils.java @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ +package org.opendaylight.controller.md.sal.test.model.util; + +import java.util.Arrays; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugment; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugmentBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.complex.from.grouping.ListViaUses; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.complex.from.grouping.ListViaUsesBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.complex.from.grouping.ListViaUsesKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.Top; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.TopBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelList; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedList; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.top.level.list.NestedListKey; +import org.opendaylight.yangtools.yang.binding.Augmentation; +import org.opendaylight.yangtools.yang.binding.DataObject; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +import com.google.common.collect.ImmutableList; + +public class ListsBindingUtils { + + private static final InstanceIdentifier TOP_PATH = InstanceIdentifier.create(Top.class); + + private ListsBindingUtils() { + throw new UnsupportedOperationException(); + } + + public static final TopLevelListKey TOP_FOO_KEY = new TopLevelListKey("foo"); + public static final TopLevelListKey TOP_BAR_KEY = new TopLevelListKey("bar"); + public static final ListViaUsesKey USES_ONE_KEY = new ListViaUsesKey("one"); + public static final ListViaUsesKey USES_TWO_KEY = new ListViaUsesKey("two"); + + + public static InstanceIdentifier path(final TopLevelListKey key) { + return TOP_PATH.child(TopLevelList.class, key); + } + + public static InstanceIdentifier path(final TopLevelListKey top,final NestedListKey nested) { + return path(top).child(NestedList.class, nested); + } + + public static InstanceIdentifier path(final TopLevelListKey top,final ListViaUsesKey uses) { + return path(top).augmentation(TreeComplexUsesAugment.class).child(ListViaUses.class, uses); + } + + public static > InstanceIdentifier path(final TopLevelListKey key, final Class augmentation) { + return path(key).augmentation(augmentation); + } + + public static Top top(final TopLevelList... listItems) { + return new TopBuilder().setTopLevelList(Arrays.asList(listItems)).build(); + } + + public static TopLevelList topLevelList(final TopLevelListKey key) { + return new TopLevelListBuilder().setKey(key).build(); + } + + public static TopLevelList topLevelList(final TopLevelListKey key, final TreeComplexUsesAugment augment) { + TopLevelListBuilder builder = new TopLevelListBuilder().setKey(key); + builder.addAugmentation(TreeComplexUsesAugment.class, augment); + return builder.build(); + } + + public static TreeComplexUsesAugment complexUsesAugment(final ListViaUsesKey... keys) { + ImmutableList.Builder listViaUses = ImmutableList. builder(); + for (ListViaUsesKey key : keys) { + listViaUses.add(new ListViaUsesBuilder().setKey(key).build()); + } + return new TreeComplexUsesAugmentBuilder().setListViaUses(listViaUses.build()).build(); + } + +} diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang new file mode 100644 index 0000000000..ddd7687628 --- /dev/null +++ b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-augment-test.yang @@ -0,0 +1,93 @@ +module opendaylight-mdsal-augment-test { + + namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:augment"; + prefix aug-test; + + import opendaylight-mdsal-list-test { + prefix test; + } + import yang-ext { + prefix ext; + } + + description + "This module contains a collection of YANG augmentations used for + some test cases."; + + revision 2014-07-09 { + description + "Test model for testing data broker with nested lists."; + } + + grouping leaf-from-grouping { + leaf leaf-from-grouping { + type string; + } + } + + grouping complex-from-grouping { + container container-with-uses { + uses leaf-from-grouping; + } + list list-via-uses { + key "name"; + leaf name { + type string; + } + } + + } + + augment "/test:top/test:top-level-list" { + ext:augment-identifier tree-leaf-only-uses-augment; + uses leaf-from-grouping; + } + + augment "/test:put-top/test:input/test:top-level-list" { + ext:augment-identifier rpc-leaf-only-uses-augment; + uses leaf-from-grouping; + } + + augment "/test:top/test:top-level-list" { + ext:augment-identifier tree-complex-uses-augment; + uses complex-from-grouping; + } + + augment "/test:put-top/test:input/test:top-level-list" { + ext:augment-identifier rpc-complex-uses-augment; + uses complex-from-grouping; + } + + augment "/test:top/test:top-level-list" { + ext:augment-identifier tree-leaf-only-augment; + + leaf simple-value { + type string; + } + } + + augment "/test:top/test:top-level-list" { + ext:augment-identifier tree-second-leaf-only-augment; + + leaf second-simple-value { + type string; + } + } + + augment "/test:put-top/test:input/test:top-level-list" { + ext:augment-identifier rpc-leaf-only-augment; + + leaf simple-value { + type string; + } + } + + augment "/test:put-top/test:input/test:top-level-list" { + ext:augment-identifier rpc-second-leaf-only-augment; + + leaf second-simple-value { + type string; + } + } + +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang new file mode 100644 index 0000000000..48666e1689 --- /dev/null +++ b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-mdsal-list-test.yang @@ -0,0 +1,51 @@ +module opendaylight-mdsal-list-test { + + namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:list"; + prefix list-test; + + + description + "This module contains a collection of YANG definitions used for + some test cases."; + + revision 2014-07-01 { + description + "Test model for testing data broker with nested lists."; + } + + grouping two-level-list { + list top-level-list { + description + "Top Level List"; + key "name"; + leaf name { + type string; + } + list nested-list { + key "name"; + leaf name { + type string; + } + leaf type { + type string; + mandatory true; + description + "Mandatory type of list."; + } + ordered-by user; + description + "A list of service functions that compose the service chain"; + } + } + } + + container top { + uses two-level-list; + } + + rpc put-top { + input { + uses two-level-list; + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/main/yang/opendaylight-sal-test-store.yang b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang similarity index 100% rename from opendaylight/md-sal/sal-binding-dom-it/src/main/yang/opendaylight-sal-test-store.yang rename to opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-sal-test-store.yang diff --git a/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang new file mode 100644 index 0000000000..3412eb531a --- /dev/null +++ b/opendaylight/md-sal/sal-test-model/src/main/yang/opendaylight-test-rpc-service.yang @@ -0,0 +1,22 @@ +module opendaylight-test-rpc-service { + yang-version 1; + namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:test:bi:ba:rpcservice"; + prefix "rpc"; + + description + "Test model for testing of registering rpc service on binding independent mount point + and retrieving rpc service via binding aware mount point."; + + revision "2014-07-01" { + description + "Initial revision"; + } + + rpc rock-the-house { + input { + leaf zip-code { + type string; + } + } + } +} \ No newline at end of file diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml index f6a8306a98..6e720299d8 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml +++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml @@ -23,6 +23,10 @@ org.opendaylight.controller config-api + + org.opendaylight.controller + sal-common-util + org.opendaylight.controller sal-binding-api diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java index a23def6262..88281bd593 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModule.java @@ -9,6 +9,8 @@ */ package org.opendaylight.controller.config.yang.config.kitchen_service.impl; +import java.util.concurrent.Future; + import org.opendaylight.controller.sample.kitchen.api.EggsType; import org.opendaylight.controller.sample.kitchen.api.KitchenService; import org.opendaylight.controller.sample.kitchen.impl.KitchenServiceImpl; @@ -16,6 +18,7 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.NotificationListener; +import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,7 +66,9 @@ public final class KitchenServiceModule extends AbstractKitchenServiceModule { } @Override - public boolean makeBreakfast( final EggsType eggs, final Class toast, final int toastDoneness ) { + public Future> makeBreakfast( final EggsType eggs, + final Class toast, + final int toastDoneness ) { return kitchenService.makeBreakfast( eggs, toast, toastDoneness ); } } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java index ef9c122ec1..7e7f342962 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/api/KitchenService.java @@ -1,7 +1,11 @@ package org.opendaylight.controller.sample.kitchen.api; +import java.util.concurrent.Future; + import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType; +import org.opendaylight.yangtools.yang.common.RpcResult; public interface KitchenService { - boolean makeBreakfast( EggsType eggs, Class toast, int toastDoneness ); + Future> makeBreakfast( EggsType eggs, Class toast, + int toastDoneness ); } diff --git a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java index 911a8c87d7..50ae8fd04f 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/sample/kitchen/impl/KitchenServiceImpl.java @@ -1,10 +1,18 @@ package org.opendaylight.controller.sample.kitchen.impl; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; - +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import org.opendaylight.controller.config.yang.config.kitchen_service.impl.KitchenServiceRuntimeMXBean; +import org.opendaylight.controller.sal.common.util.RpcErrors; +import org.opendaylight.controller.sal.common.util.Rpcs; import org.opendaylight.controller.sample.kitchen.api.EggsType; import org.opendaylight.controller.sample.kitchen.api.KitchenService; +import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInput; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.MakeToastInputBuilder; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToastType; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterListener; @@ -12,16 +20,31 @@ import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120 import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterRestocked; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.ToasterService; import org.opendaylight.yang.gen.v1.http.netconfcentral.org.ns.toaster.rev091120.WheatBread; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorSeverity; +import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; +import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList.Builder; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.JdkFutureAdapters; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; + public class KitchenServiceImpl implements KitchenService, KitchenServiceRuntimeMXBean, ToasterListener { private static final Logger log = LoggerFactory.getLogger( KitchenServiceImpl.class ); private final ToasterService toaster; + private final ListeningExecutorService executor = + MoreExecutors.listeningDecorator( Executors.newCachedThreadPool() ); + private volatile boolean toasterOutOfBread; public KitchenServiceImpl(ToasterService toaster) { @@ -29,39 +52,102 @@ public class KitchenServiceImpl implements KitchenService, KitchenServiceRuntime } @Override - public boolean makeBreakfast( EggsType eggs, Class toast, int toastDoneness ) { + public Future> makeBreakfast( EggsType eggsType, Class toastType, + int toastDoneness ) { + + // Call makeToast and use JdkFutureAdapters to convert the Future to a ListenableFuture, + // The OpendaylightToaster impl already returns a ListenableFuture so the conversion is + // actually a no-op. + + ListenableFuture> makeToastFuture = JdkFutureAdapters.listenInPoolThread( + makeToast( toastType, toastDoneness ), executor ); + + ListenableFuture> makeEggsFuture = makeEggs( eggsType ); + + // Combine the 2 ListenableFutures into 1 containing a list of RpcResults. + + ListenableFuture>> combinedFutures = + Futures.allAsList( ImmutableList.of( makeToastFuture, makeEggsFuture ) ); + + // Then transform the RpcResults into 1. + + return Futures.transform( combinedFutures, + new AsyncFunction>,RpcResult>() { + @Override + public ListenableFuture> apply( List> results ) + throws Exception { + boolean atLeastOneSucceeded = false; + Builder errorList = ImmutableList.builder(); + for( RpcResult result: results ) { + if( result.isSuccessful() ) { + atLeastOneSucceeded = true; + } + + if( result.getErrors() != null ) { + errorList.addAll( result.getErrors() ); + } + } + + return Futures.immediateFuture( + Rpcs. getRpcResult( atLeastOneSucceeded, errorList.build() ) ); + } + } ); + } + + private ListenableFuture> makeEggs( EggsType eggsType ) { + + return executor.submit( new Callable>() { + + @Override + public RpcResult call() throws Exception { + + // We don't actually do anything here - just return a successful result. + return Rpcs. getRpcResult( true, Collections.emptyList() ); + } + } ); + } + + private Future> makeToast( Class toastType, + int toastDoneness ) { if( toasterOutOfBread ) { log.info( "We're out of toast but we can make eggs" ); - return true; + return Futures.immediateFuture( Rpcs. getRpcResult( true, + Arrays.asList( RpcErrors.getRpcError( "", "partial-operation", null, + ErrorSeverity.WARNING, + "Toaster is out of bread but we can make you eggs", + ErrorType.APPLICATION, null ) ) ) ); } // Access the ToasterService to make the toast. - // We don't actually make the eggs for this example - sorry. - MakeToastInputBuilder toastInput = new MakeToastInputBuilder(); - toastInput.setToasterDoneness( (long) toastDoneness); - toastInput.setToasterToastType( toast ); - try { - RpcResult result = toaster.makeToast( toastInput.build() ).get(); + MakeToastInput toastInput = new MakeToastInputBuilder() + .setToasterDoneness( (long) toastDoneness ) + .setToasterToastType( toastType ) + .build(); + + return toaster.makeToast( toastInput ); + } + @Override + public Boolean makeScrambledWithWheat() { + try { + // This call has to block since we must return a result to the JMX client. + RpcResult result = makeBreakfast( EggsType.SCRAMBLED, WheatBread.class, 2 ).get(); if( result.isSuccessful() ) { - log.info( "makeToast succeeded" ); + log.info( "makeBreakfast succeeded" ); } else { - log.warn( "makeToast failed: " + result.getErrors() ); + log.warn( "makeBreakfast failed: " + result.getErrors() ); } return result.isSuccessful(); + } catch( InterruptedException | ExecutionException e ) { - log.warn( "Error occurred during toast creation" ); + log.warn( "An error occurred while maing breakfast: " + e ); } - return false; - } - @Override - public Boolean makeScrambledWithWheat() { - return makeBreakfast( EggsType.SCRAMBLED, WheatBread.class, 2 ); + return Boolean.FALSE; } /** diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java index 907b35475f..30f1762197 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java +++ b/opendaylight/md-sal/samples/toaster-it/src/test/java/org/opendaylight/controller/sample/toaster/it/ToasterTest.java @@ -93,13 +93,13 @@ public class ToasterTest { long toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); assertEquals(0, toastsMade); - boolean toasts = true; + boolean success = true; // Make toasts using OSGi service - toasts &= kitchenService.makeBreakfast( EggsType.SCRAMBLED, HashBrown.class, 4); - toasts &= kitchenService.makeBreakfast( EggsType.POACHED, WhiteBread.class, 8 ); + success &= kitchenService.makeBreakfast( EggsType.SCRAMBLED, HashBrown.class, 4).get().isSuccessful(); + success &= kitchenService.makeBreakfast( EggsType.POACHED, WhiteBread.class, 8 ).get().isSuccessful(); - Assert.assertTrue("Not all toasts done by " + kitchenService, toasts); + Assert.assertTrue("Not all breakfasts succeeded", success); // Verify toasts made count on provider via JMX/config-subsystem toastsMade = (long) platformMBeanServer.getAttribute(providerOn, "ToastsMade"); diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml b/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml index f904f9726e..d76c2d3c22 100644 --- a/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml +++ b/opendaylight/md-sal/samples/toaster-it/src/test/resources/logback.xml @@ -10,7 +10,9 @@ - + + + diff --git a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java index ec352e8f51..d2b0f90194 100644 --- a/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java +++ b/opendaylight/md-sal/samples/toaster-provider/src/main/java/org/opendaylight/controller/sample/toaster/provider/OpendaylightToaster.java @@ -9,19 +9,24 @@ package org.opendaylight.controller.sample.toaster.provider; import java.util.Arrays; import java.util.Collections; +import java.util.List; import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicReference; import org.opendaylight.controller.config.yang.config.toaster_provider.impl.ToasterProviderRuntimeMXBean; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; +import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; +import org.opendaylight.controller.md.sal.common.api.TransactionStatus; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.common.util.RpcErrors; import org.opendaylight.controller.sal.common.util.Rpcs; @@ -44,7 +49,13 @@ import org.opendaylight.yangtools.yang.common.RpcResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.base.Function; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.AsyncFunction; +import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; +import com.google.common.util.concurrent.SettableFuture; public class OpendaylightToaster implements ToasterService, ToasterProviderRuntimeMXBean, DataChangeListener, AutoCloseable { @@ -61,10 +72,9 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti private final ExecutorService executor; - // As you will see we are using multiple threads here. Therefore we need to be careful about concurrency. - // In this case we use the taskLock to provide synchronization for the current task. - private volatile Future> currentTask; - private final Object taskLock = new Object(); + // The following holds the Future for the current make toast task. + // This is used to cancel the current toast. + private final AtomicReference> currentMakeToastTask = new AtomicReference<>(); private final AtomicLong amountOfBreadInStock = new AtomicLong( 100 ); @@ -83,7 +93,7 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti public void setDataProvider(final DataBroker salDataProvider) { this.dataProvider = salDataProvider; - updateStatus(); + setToasterStatusUp( null ); } /** @@ -97,22 +107,30 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti if (dataProvider != null) { WriteTransaction t = dataProvider.newWriteOnlyTransaction(); t.delete(LogicalDatastoreType.OPERATIONAL,TOASTER_IID); - t.commit().get(); // FIXME: This call should not be blocking. + ListenableFuture> future = t.commit(); + Futures.addCallback( future, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + LOG.debug( "Delete Toaster commit result: " + result ); + } + + @Override + public void onFailure( Throwable t ) { + LOG.error( "Delete of Toaster failed", t ); + } + } ); } } - private Toaster buildToaster() { - // We don't need to synchronize on currentTask here b/c it's declared volatile and - // we're just doing a read. - boolean isUp = currentTask == null; + private Toaster buildToaster( ToasterStatus status ) { // note - we are simulating a device whose manufacture and model are // fixed (embedded) into the hardware. // This is why the manufacture and model number are hardcoded. - ToasterBuilder tb = new ToasterBuilder(); - tb.setToasterManufacturer(TOASTER_MANUFACTURER).setToasterModelNumber(TOASTER_MODEL_NUMBER) - .setToasterStatus(isUp ? ToasterStatus.Up : ToasterStatus.Down); - return tb.build(); + return new ToasterBuilder().setToasterManufacturer( TOASTER_MANUFACTURER ) + .setToasterModelNumber( TOASTER_MODEL_NUMBER ) + .setToasterStatus( status ) + .build(); } /** @@ -133,57 +151,148 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti } /** - * RestConf RPC call implemented from the ToasterService interface. + * RPC call implemented from the ToasterService interface that cancels the current + * toast, if any. */ @Override public Future> cancelToast() { - synchronized (taskLock) { - if (currentTask != null) { - currentTask.cancel(true); - currentTask = null; - } + + Future current = currentMakeToastTask.getAndSet( null ); + if( current != null ) { + current.cancel( true ); } + // Always return success from the cancel toast call. - return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections. emptySet())); + return Futures.immediateFuture( Rpcs. getRpcResult( true, + Collections.emptyList() ) ); } /** - * RestConf RPC call implemented from the ToasterService interface. + * RPC call implemented from the ToasterService interface that attempts to make toast. */ @Override public Future> makeToast(final MakeToastInput input) { LOG.info("makeToast: " + input); - synchronized (taskLock) { - if (currentTask != null) { - // return an error since we are already toasting some toast. - LOG.info( "Toaster is already making toast" ); + final SettableFuture> futureResult = SettableFuture.create(); - RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( "", "in-use", null, ErrorSeverity.WARNING, - "Toaster is busy", ErrorType.APPLICATION, null ) ) ); - return Futures.immediateFuture(result); - } - else if( outOfBread() ) { - RpcResult result = Rpcs. getRpcResult(false, null, Arrays.asList( - RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null, - "Toaster is out of bread", - ErrorType.APPLICATION, null ) ) ); - return Futures.immediateFuture(result); - } - else { - // Notice that we are moving the actual call to another thread, - // allowing this thread to return immediately. - // The MD-SAL design encourages asynchronus programming. If the - // caller needs to block until the call is - // complete then they can leverage the blocking methods on the - // Future interface. - currentTask = executor.submit(new MakeToastTask(input)); + checkStatusAndMakeToast( input, futureResult ); + + return futureResult; + } + + private List makeToasterOutOfBreadError() { + return Arrays.asList( + RpcErrors.getRpcError( "out-of-stock", "resource-denied", null, null, + "Toaster is out of bread", + ErrorType.APPLICATION, null ) ); + } + + private List makeToasterInUseError() { + return Arrays.asList( + RpcErrors.getRpcError( "", "in-use", null, ErrorSeverity.WARNING, + "Toaster is busy", ErrorType.APPLICATION, null ) ); + } + + private void checkStatusAndMakeToast( final MakeToastInput input, + final SettableFuture> futureResult ) { + + // Read the ToasterStatus and, if currently Up, try to write the status to Down. + // If that succeeds, then we essentially have an exclusive lock and can proceed + // to make toast. + + final ReadWriteTransaction tx = dataProvider.newReadWriteTransaction(); + ListenableFuture> readFuture = + tx.read( LogicalDatastoreType.OPERATIONAL, TOASTER_IID ); + + final ListenableFuture> commitFuture = + Futures.transform( readFuture, new AsyncFunction, + RpcResult>() { + + @Override + public ListenableFuture> apply( + Optional toasterData ) throws Exception { + + ToasterStatus toasterStatus = ToasterStatus.Up; + if( toasterData.isPresent() ) { + toasterStatus = ((Toaster)toasterData.get()).getToasterStatus(); + } + + LOG.debug( "Read toaster status: {}", toasterStatus ); + + if( toasterStatus == ToasterStatus.Up ) { + + if( outOfBread() ) { + LOG.debug( "Toaster is out of bread" ); + + return Futures.immediateFuture( Rpcs.getRpcResult( + false, null, makeToasterOutOfBreadError() ) ); + } + + LOG.debug( "Setting Toaster status to Down" ); + + // We're not currently making toast - try to update the status to Down + // to indicate we're going to make toast. This acts as a lock to prevent + // concurrent toasting. + tx.put( LogicalDatastoreType.OPERATIONAL, TOASTER_IID, + buildToaster( ToasterStatus.Down ) ); + return tx.commit(); + } + + LOG.debug( "Oops - already making toast!" ); + + // Return an error since we are already making toast. This will get + // propagated to the commitFuture below which will interpret the null + // TransactionStatus in the RpcResult as an error condition. + return Futures.immediateFuture( Rpcs.getRpcResult( + false, null, makeToasterInUseError() ) ); + } + } ); + + Futures.addCallback( commitFuture, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + if( result.getResult() == TransactionStatus.COMMITED ) { + + // OK to make toast + currentMakeToastTask.set( executor.submit( + new MakeToastTask( input, futureResult ) ) ); + } else { + + LOG.debug( "Setting error result" ); + + // Either the transaction failed to commit for some reason or, more likely, + // the read above returned ToasterStatus.Down. Either way, fail the + // futureResult and copy the errors. + + futureResult.set( Rpcs.getRpcResult( false, null, result.getErrors() ) ); + } } - } - updateStatus(); - return currentTask; + @Override + public void onFailure( Throwable ex ) { + if( ex instanceof OptimisticLockFailedException ) { + + // Another thread is likely trying to make toast simultaneously and updated the + // status before us. Try reading the status again - if another make toast is + // now in progress, we should get ToasterStatus.Down and fail. + + LOG.debug( "Got OptimisticLockFailedException - trying again" ); + + checkStatusAndMakeToast( input, futureResult ); + + } else { + + LOG.error( "Failed to commit Toaster status", ex ); + + // Got some unexpected error so fail. + futureResult.set( Rpcs. getRpcResult( false, null, Arrays.asList( + RpcErrors.getRpcError( null, null, null, ErrorSeverity.ERROR, + ex.getMessage(), + ErrorType.APPLICATION, ex ) ) ) ); + } + } + } ); } /** @@ -195,17 +304,15 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti public Future> restockToaster(final RestockToasterInput input) { LOG.info( "restockToaster: " + input ); - synchronized( taskLock ) { - amountOfBreadInStock.set( input.getAmountOfBreadToStock() ); + amountOfBreadInStock.set( input.getAmountOfBreadToStock() ); - if( amountOfBreadInStock.get() > 0 ) { - ToasterRestocked reStockedNotification = - new ToasterRestockedBuilder().setAmountOfBread( input.getAmountOfBreadToStock() ).build(); - notificationProvider.publish( reStockedNotification ); - } + if( amountOfBreadInStock.get() > 0 ) { + ToasterRestocked reStockedNotification = new ToasterRestockedBuilder() + .setAmountOfBread( input.getAmountOfBreadToStock() ).build(); + notificationProvider.publish( reStockedNotification ); } - return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections. emptySet())); + return Futures.immediateFuture(Rpcs. getRpcResult(true, Collections.emptyList())); } /** @@ -225,19 +332,38 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti return toastsMade.get(); } - private void updateStatus() { - if (dataProvider != null) { - WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); - tx.put(LogicalDatastoreType.OPERATIONAL,TOASTER_IID, buildToaster()); + private void setToasterStatusUp( final Function resultCallback ) { - try { - tx.commit().get(); - } catch (InterruptedException | ExecutionException e) { - LOG.warn("Failed to update toaster status, operational otherwise", e); + WriteTransaction tx = dataProvider.newWriteOnlyTransaction(); + tx.put( LogicalDatastoreType.OPERATIONAL,TOASTER_IID, buildToaster( ToasterStatus.Up ) ); + + ListenableFuture> commitFuture = tx.commit(); + + Futures.addCallback( commitFuture, new FutureCallback>() { + @Override + public void onSuccess( RpcResult result ) { + if( result.getResult() != TransactionStatus.COMMITED ) { + LOG.error( "Failed to update toaster status: " + result.getErrors() ); + } + + notifyCallback( result.getResult() == TransactionStatus.COMMITED ); } - } else { - LOG.trace("No data provider configured, not updating status"); - } + + @Override + public void onFailure( Throwable t ) { + // We shouldn't get an OptimisticLockFailedException (or any ex) as no + // other component should be updating the operational state. + LOG.error( "Failed to update toaster status", t ); + + notifyCallback( false ); + } + + void notifyCallback( boolean result ) { + if( resultCallback != null ) { + resultCallback.apply( result ); + } + } + } ); } private boolean outOfBread() @@ -245,19 +371,22 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti return amountOfBreadInStock.get() == 0; } - private class MakeToastTask implements Callable> { + private class MakeToastTask implements Callable { final MakeToastInput toastRequest; + final SettableFuture> futureResult; - public MakeToastTask(final MakeToastInput toast) { - toastRequest = toast; + public MakeToastTask( final MakeToastInput toastRequest, + final SettableFuture> futureResult ) { + this.toastRequest = toastRequest; + this.futureResult = futureResult; } @Override - public RpcResult call() { + public Void call() { try { - // make toast just sleeps for n secondn per doneness level. + // make toast just sleeps for n seconds per doneness level. long darknessFactor = OpendaylightToaster.this.darknessFactor.get(); Thread.sleep(darknessFactor * toastRequest.getToasterDoneness()); @@ -275,15 +404,26 @@ public class OpendaylightToaster implements ToasterService, ToasterProviderRunti notificationProvider.publish( new ToasterOutOfBreadBuilder().build() ); } - synchronized (taskLock) { - currentTask = null; - } + // Set the Toaster status back to up - this essentially releases the toasting lock. + // We can't clear the current toast task nor set the Future result until the + // update has been committed so we pass a callback to be notified on completion. + + setToasterStatusUp( new Function() { + @Override + public Void apply( Boolean result ) { + + currentMakeToastTask.set( null ); + + LOG.debug("Toast done"); - updateStatus(); + futureResult.set( Rpcs.getRpcResult( true, null, + Collections.emptyList() ) ); - LOG.debug("Toast done"); + return null; + } + } ); - return Rpcs. getRpcResult(true, null, Collections. emptySet()); + return null; } } } diff --git a/opendaylight/netconf/config-netconf-connector/pom.xml b/opendaylight/netconf/config-netconf-connector/pom.xml index c10f0a9089..8a29139854 100644 --- a/opendaylight/netconf/config-netconf-connector/pom.xml +++ b/opendaylight/netconf/config-netconf-connector/pom.xml @@ -105,7 +105,6 @@ org.opendaylight.controller.netconf.confignetconfconnector.transactions, org.opendaylight.controller.netconf.confignetconfconnector.util, org.opendaylight.controller.netconf.confignetconfconnector.osgi, - org.opendaylight.controller.config.util, org.opendaylight.controller.netconf.confignetconfconnector.exception, com.google.common.base, com.google.common.collect, @@ -130,7 +129,9 @@ com.google.common.io, org.opendaylight.yangtools.yang.model.api.type, org.opendaylight.yangtools.sal.binding.generator.spi, - org.opendaylight.yangtools.sal.binding.yang.types, + org.opendaylight.yangtools.sal.binding.yang.types, + org.opendaylight.controller.config.util + diff --git a/opendaylight/netconf/netconf-cli/.gitignore b/opendaylight/netconf/netconf-cli/.gitignore new file mode 100644 index 0000000000..d5de9f2e8f --- /dev/null +++ b/opendaylight/netconf/netconf-cli/.gitignore @@ -0,0 +1,2 @@ +*.log +cache diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java index 87f51364ba..cf48729113 100644 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java @@ -20,6 +20,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlRootElement; import org.opendaylight.controller.northbound.bundlescanner.IBundleScanService; +import org.opendaylight.controller.northbound.commons.exception.GenericExceptionMapper; import org.opendaylight.controller.northbound.commons.query.QueryContextProvider; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -60,6 +61,7 @@ public class NorthboundApplication extends Application { _singletons.add(getJsonProvider()); _singletons.add(new JacksonJsonProcessingExceptionMapper()); _singletons.add(new QueryContextProvider()); + _singletons.add(new GenericExceptionMapper()); } //////////////////////////////////////////////////////////////// diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java new file mode 100644 index 0000000000..d2bbfea870 --- /dev/null +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/exception/GenericExceptionMapper.java @@ -0,0 +1,24 @@ +package org.opendaylight.controller.northbound.commons.exception; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import javax.ws.rs.ext.Provider; + +@Provider +public class GenericExceptionMapper implements ExceptionMapper { + + @Override + public Response toResponse(Exception exception) { + //check if WebApplicationException and reuse status code + if (exception instanceof WebApplicationException) { + WebApplicationException ex = (WebApplicationException) exception; + return Response.status(ex.getResponse().getStatus()). + entity(ex.getResponse().getEntity()).build(); + } + // throw 500 for all other errors + return Response.status(Response.Status.INTERNAL_SERVER_ERROR). + entity(exception.getMessage()).build(); + } + +} diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java index 9825d0eefb..4c0c94ccb8 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/packet/IEEE8021Q.java @@ -11,6 +11,7 @@ package org.opendaylight.controller.sal.packet; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; + import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.opendaylight.controller.sal.match.Match; @@ -156,4 +157,14 @@ public class IEEE8021Q extends Packet { match.setField(MatchType.DL_VLAN_PR, this.getPcp()); match.setField(MatchType.DL_TYPE, this.getEtherType()); } + + /** + * Gets the header size in bits + * @return The .1Q header size in bits + */ + @Override + public int getHeaderSize() { + return 32; + } + } diff --git a/pom.xml b/pom.xml index 012d9399b8..af84002429 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,7 @@ features/base features/controller features/adsal + features/extras opendaylight/dummy-console opendaylight/karaf-branding opendaylight/distribution/opendaylight-karaf