From 370729db0a2487c65b16e1dcc56ef3037dfef377 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 1 Oct 2019 12:21:41 +0200 Subject: [PATCH] Remove dom.codec.gen.spi remnants This removes the last remnants of the binding-dom-codec SPI contract, keeping all implementation details internal. Change-Id: I7f5c71b3abb17737ef0fd8c580260c01bc777c9a Signed-off-by: Robert Varga --- .../dom/codec/gen/spi/AbstractSource.java | 106 ------------------ .../gen/spi/StaticConstantDefinition.java | 75 ------------- 2 files changed, 181 deletions(-) delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/AbstractSource.java delete mode 100644 binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/StaticConstantDefinition.java diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/AbstractSource.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/AbstractSource.java deleted file mode 100644 index 75f4471015..0000000000 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/AbstractSource.java +++ /dev/null @@ -1,106 +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.mdsal.binding.dom.codec.gen.spi; - -import com.google.common.collect.Iterators; -import com.google.common.collect.UnmodifiableIterator; -import java.util.Collections; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; -import org.opendaylight.mdsal.binding.model.api.Type; - -/** - * An abstract source. - * - * @deprecated This class is superseded by an internal implementation. - */ -@Deprecated -public abstract class AbstractSource { - private final Set staticConstants = new HashSet<>(); - - public final void staticConstant(final String name, final Class type, final T value) { - staticConstants.add(new StaticConstantDefinition(name, type, value)); - } - - public final Set getStaticConstants() { - return Collections.unmodifiableSet(staticConstants); - } - - private static StringBuilder commonInvoke(final CharSequence object, final String methodName) { - final StringBuilder sb = new StringBuilder(); - if (object != null) { - sb.append(object).append('.'); - } - return sb.append(methodName).append('('); - } - - protected static final CharSequence invoke(final CharSequence object, final String methodName, final Object arg) { - return commonInvoke(object, methodName).append(arg).append(')'); - } - - protected static final CharSequence invoke(final CharSequence object, final String methodName, - final Object... args) { - final StringBuilder sb = commonInvoke(object, methodName); - - final UnmodifiableIterator iterator = Iterators.forArray(args); - while (iterator.hasNext()) { - sb.append(iterator.next()); - if (iterator.hasNext()) { - sb.append(','); - } - } - return sb.append(')'); - } - - protected static final CharSequence assign(final String var, final CharSequence value) { - return assign((String) null, var, value); - } - - protected static final CharSequence assign(final String type, final String var, final CharSequence value) { - final StringBuilder sb = new StringBuilder(); - if (type != null) { - sb.append(type).append(' '); - } - return sb.append(var).append(" = ").append(value); - } - - protected static final CharSequence assign(final Class type, final String var, final CharSequence value) { - return assign(type.getName(), var, value); - } - - protected static final CharSequence assign(final Type type, final String var, final CharSequence value) { - return assign(type.getFullyQualifiedName(), var, value); - } - - protected static final CharSequence cast(final Class type, final CharSequence value) { - return cast(type.getName(), value); - } - - protected static final CharSequence cast(final Type type, final CharSequence value) { - return cast(type.getFullyQualifiedName(), value); - } - - protected static final CharSequence cast(final String type, final CharSequence value) { - return "((" + type + ") " + value + ')'; - } - - protected static final CharSequence forEach(final String iterable, final String iteratorName, - final String valueType, final String valueName, final CharSequence body) { - return new StringBuilder() - .append(statement(assign(Iterator.class, iteratorName, invoke(iterable, "iterator")))) - .append("while (").append(invoke(iteratorName, "hasNext")).append(") {\n") - .append(statement(assign(valueType, valueName, cast(valueType, invoke(iteratorName, "next"))))) - .append(body) - .append("\n}\n"); - } - - protected static final CharSequence statement(final CharSequence statement) { - return new StringBuilder(statement).append(";\n"); - } -} diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/StaticConstantDefinition.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/StaticConstantDefinition.java deleted file mode 100644 index b231a523db..0000000000 --- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/gen/spi/StaticConstantDefinition.java +++ /dev/null @@ -1,75 +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.mdsal.binding.dom.codec.gen.spi; - -import static java.util.Objects.requireNonNull; - -/** - * Definition of static property for generated class. - * - *

- * This definition consists of - *

    - *
  • name - property name
    • - *
  • type - Java type for property
    • - *
  • value - value to which property should be initialized
    • - *
- * - * @deprecated This class is superseded by an internal implementation. - */ -@Deprecated -public class StaticConstantDefinition { - - private final String name; - private final Class type; - private final Object value; - - public StaticConstantDefinition(final String name, final Class type, final Object value) { - this.name = requireNonNull(name); - this.type = requireNonNull(type); - this.value = requireNonNull(value); - } - - public String getName() { - return name; - } - - public Class getType() { - return type; - } - - public Object getValue() { - return value; - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + name.hashCode(); - return result; - } - - @Override - public boolean equals(final Object obj) { - if (this == obj) { - return true; - } - if (obj == null) { - return false; - } - if (getClass() != obj.getClass()) { - return false; - } - StaticConstantDefinition other = (StaticConstantDefinition) obj; - if (!name.equals(other.name)) { - return false; - } - return true; - } -} -- 2.36.6