Skip to content

Commit cbc14ba

Browse files
committed
Remove unused imports and unnecessary code
1 parent 8f54228 commit cbc14ba

File tree

19 files changed

+8
-31
lines changed

19 files changed

+8
-31
lines changed

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/aspectmodel/VersionNumber.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ public static Try<VersionNumber> tryParse( final String versionString ) {
113113
}
114114
final VersionNumberParser parser = new VersionNumberParser( versionString );
115115

116-
int major = 0;
117-
int minor = 0;
118-
int micro = 0;
116+
int major;
117+
int minor;
118+
int micro;
119119

120120
major = parser.parseNextDigit();
121121
minor = parser.parseNextDigit();

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/ModelElement.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.eclipse.esmf.aspectmodel.AspectModelFile;
2020
import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
2121
import org.eclipse.esmf.aspectmodel.visitor.AspectVisitor;
22-
import org.eclipse.esmf.samm.KnownVersion;
2322

2423
/**
2524
* The ModelElement interface provides all facilities that all Aspect Model elements have.

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/characteristic/StructuredValue.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import java.util.List;
1717

1818
import org.eclipse.esmf.metamodel.Characteristic;
19-
import org.eclipse.esmf.metamodel.Property;
2019

2120
/**
2221
* @since SAMM 1.0.0

core/esmf-aspect-meta-model-interface/src/main/java/org/eclipse/esmf/metamodel/vocabulary/SAMME.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.util.stream.Stream;
1717

18-
import org.eclipse.esmf.metamodel.QuantityKind;
1918
import org.eclipse.esmf.samm.KnownVersion;
2019

2120
import org.apache.jena.rdf.model.Property;

core/esmf-aspect-meta-model-java/src-buildtime/main/java/org/eclipse/esmf/buildtime/template/Units.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import java.util.Arrays;
1717
import java.util.HashMap;
18-
import java.util.List;
1918
import java.util.Locale;
2019
import java.util.Map;
2120
import java.util.Optional;
@@ -28,10 +27,8 @@
2827
import org.eclipse.esmf.aspectmodel.AspectModelFile;
2928
import org.eclipse.esmf.aspectmodel.loader.MetaModelBaseAttributes;
3029
import org.eclipse.esmf.aspectmodel.resolver.modelfile.MetaModelFile;
31-
import org.eclipse.esmf.aspectmodel.urn.AspectModelUrn;
3230
import org.eclipse.esmf.metamodel.Unit;
3331
import org.eclipse.esmf.metamodel.QuantityKind;
34-
import org.eclipse.esmf.metamodel.datatype.LangString;
3532
import org.eclipse.esmf.metamodel.impl.DefaultUnit;
3633
import org.eclipse.esmf.metamodel.vocabulary.SammNs;
3734

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/edit/change/RenameNamespace.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ protected ModelChanges calculateChangesForFile( final AspectModelFile aspectMode
127127
// Handle object
128128
if ( statement.getObject().isURIResource() ) {
129129
final String objectUri = statement.getObject().asResource().getURI();
130-
if ( objectUri.startsWith( from.toString() + "#" ) ) {
130+
if ( objectUri.startsWith( from + "#" ) ) {
131131
addObject = addModel.createResource( to.toString() + objectUri.substring( from.toString().length() ) );
132132
removeObject = addModel.createResource( objectUri );
133133
} else {

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/loader/instantiator/AspectInstantiator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.eclipse.esmf.aspectmodel.loader.instantiator;
1515

1616
import java.util.List;
17-
import java.util.Optional;
1817
import java.util.stream.Collectors;
1918

2019
import org.eclipse.esmf.aspectmodel.loader.Instantiator;
@@ -24,7 +23,6 @@
2423
import org.eclipse.esmf.metamodel.Event;
2524
import org.eclipse.esmf.metamodel.Operation;
2625
import org.eclipse.esmf.metamodel.Property;
27-
import org.eclipse.esmf.metamodel.characteristic.Collection;
2826
import org.eclipse.esmf.metamodel.impl.DefaultAspect;
2927
import org.eclipse.esmf.metamodel.vocabulary.SammNs;
3028

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/serializer/PrettyPrinter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ private String quoteValue( final String value ) {
311311
*
312312
* @param input the input string
313313
*/
314+
@SuppressWarnings( "UnnecessaryUnicodeEscape" )
314315
private void escapeStringAndAppendToBuilder( final String input, final StringBuilder builder ) {
315316
final String escapedSpecialCharacters = StringEscapeUtils.escapeJava( input );
316317
// The following replaces unicode escape sequences such as \uABCD with the corresponding unicode character

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/utils/MarkdownHtmlRenderer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import java.util.List;
1919
import java.util.Map;
2020
import java.util.regex.Matcher;
21-
import java.util.regex.Pattern;
2221
import java.util.stream.Collectors;
2322

2423
import org.commonmark.node.Node;

core/esmf-aspect-meta-model-java/src/main/java/org/eclipse/esmf/aspectmodel/versionupdate/MetaModelVersionMigrator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public AspectModelFile apply( final AspectModelFile modelFile ) {
129129
}
130130
if ( sourceVersion.greaterThan( LATEST_SAMM ) ) {
131131
throw new InvalidVersionException( "Aspect Meta Model version %s in source model %sis not supported".formatted( sourceVersion,
132-
modelFile.sourceLocation().map( l -> l.toString() + " " ).orElse( "" ) ) );
132+
modelFile.sourceLocation().map( l -> l + " " ).orElse( "" ) ) );
133133
}
134134

135135
final Model migratedModel = migrate( migrators, sourceVersion, LATEST_SAMM, modelFile.sourceModel() );

0 commit comments

Comments
 (0)