From 6b21ebf8aacac0c1f99f10d3ade680070e388e74 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 10 Jun 2014 11:26:17 +0200 Subject: [PATCH] BUG-272: fix toaster-consumer Removes superfluous imports from the same package. Change-Id: I9cac529f12587660161b219376d0340ddecd8c88 Signed-off-by: Robert Varga --- .../impl/KitchenServiceModule.java | 27 +++++++++---------- .../impl/KitchenServiceModuleFactory.java | 24 +++++++---------- 2 files changed, 23 insertions(+), 28 deletions(-) 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 4dc3645131..a23def6262 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 @@ -1,15 +1,14 @@ /** -* Generated file + * Generated file -* Generated from: yang module name: toaster-consumer-impl yang module local name: toaster-consumer-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Feb 05 11:31:30 CET 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ + * Generated from: yang module name: toaster-consumer-impl yang module local name: toaster-consumer-impl + * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + * Generated at: Wed Feb 05 11:31:30 CET 2014 + * + * Do not modify this file unless it is present under src/main directory + */ package org.opendaylight.controller.config.yang.config.kitchen_service.impl; -import org.opendaylight.controller.config.yang.config.kitchen_service.impl.AbstractKitchenServiceModule; import org.opendaylight.controller.sample.kitchen.api.EggsType; import org.opendaylight.controller.sample.kitchen.api.KitchenService; import org.opendaylight.controller.sample.kitchen.impl.KitchenServiceImpl; @@ -21,17 +20,17 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** -* -*/ + * + */ public final class KitchenServiceModule extends AbstractKitchenServiceModule { private static final Logger log = LoggerFactory.getLogger(KitchenServiceModule.class); - public KitchenServiceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + public KitchenServiceModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public KitchenServiceModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, - KitchenServiceModule oldModule, java.lang.AutoCloseable oldInstance) { + public KitchenServiceModule(final org.opendaylight.controller.config.api.ModuleIdentifier identifier, final org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, + final KitchenServiceModule oldModule, final java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -64,7 +63,7 @@ public final class KitchenServiceModule extends AbstractKitchenServiceModule { } @Override - public boolean makeBreakfast( EggsType eggs, Class toast, int toastDoneness ) { + public boolean 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/config/yang/config/kitchen_service/impl/KitchenServiceModuleFactory.java b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModuleFactory.java index 2d6e7f3262..0c68cd2254 100644 --- a/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModuleFactory.java +++ b/opendaylight/md-sal/samples/toaster-consumer/src/main/java/org/opendaylight/controller/config/yang/config/kitchen_service/impl/KitchenServiceModuleFactory.java @@ -1,21 +1,17 @@ /** -* Generated file + * Generated file -* Generated from: yang module name: toaster-consumer-impl yang module local name: toaster-consumer-impl -* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Wed Feb 05 11:31:30 CET 2014 -* -* Do not modify this file unless it is present under src/main directory -*/ + * Generated from: yang module name: toaster-consumer-impl yang module local name: toaster-consumer-impl + * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator + * Generated at: Wed Feb 05 11:31:30 CET 2014 + * + * Do not modify this file unless it is present under src/main directory + */ package org.opendaylight.controller.config.yang.config.kitchen_service.impl; -import org.opendaylight.controller.config.yang.config.kitchen_service.impl.AbstractKitchenServiceModuleFactory; - /** -* -*/ -public class KitchenServiceModuleFactory extends AbstractKitchenServiceModuleFactory -{ - + * + */ +public class KitchenServiceModuleFactory extends AbstractKitchenServiceModuleFactory { } -- 2.36.6