Skip to content

Commit 7e2ddf4

Browse files
authored
Update codebase, next round (#230)
* Update codebase, next round Killing issues as reported by Sonar * More pipe catch Changes: * Use try-with-resources * Add missing ATOVerride * Use Encoding class * More diamonds/type-infer * mark deprecated things as ignored by sonar
1 parent a8605d6 commit 7e2ddf4

File tree

216 files changed

+1134
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

216 files changed

+1134
-370
lines changed

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/BeanEntry.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,15 @@ public interface BeanEntry<Q extends Annotation, T> extends Entry<Q, T> {
3636
*
3737
* @return Qualifier annotation
3838
*/
39+
@Override
3940
Q getKey();
4041

4142
/**
4243
* Returns the associated instance of the bean; returns same instance for each call.
4344
*
4445
* @return Bean instance (lazily-created)
4546
*/
47+
@Override
4648
T getValue();
4749

4850
/**

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanInjector.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ final class BeanInjector<B> implements MembersInjector<B> {
4242
// Public methods
4343
// ----------------------------------------------------------------------
4444

45+
@Override
4546
public void injectMembers(final B bean) {
4647
for (final PropertyBinding b : bindings) {
4748
b.injectProperty(bean);

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanLifecycle.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class BeanLifecycle implements PrivilegedAction<Void> {
5555
this.stopMethods = toArray(stopMethods);
5656

5757
// ensure we can invoke all methods
58-
AccessController.doPrivileged(this);
58+
AccessController.doPrivileged(this); // NOSONAR
5959
}
6060

6161
// ----------------------------------------------------------------------
@@ -132,9 +132,10 @@ public void stop(final Object bean) {
132132
// PrivilegedAction methods
133133
// ----------------------------------------------------------------------
134134

135+
@Override
135136
public Void run() {
136-
AccessibleObject.setAccessible(startMethods, true);
137-
AccessibleObject.setAccessible(stopMethods, true);
137+
AccessibleObject.setAccessible(startMethods, true); // NOSONAR
138+
AccessibleObject.setAccessible(stopMethods, true); // NOSONAR
138139

139140
return null;
140141
}

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanListener.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public BeanListener(final BeanBinder beanBinder) {
4343
// Public methods
4444
// ----------------------------------------------------------------------
4545

46+
@Override
4647
public <B> void hear(final TypeLiteral<B> type, final TypeEncounter<B> encounter) {
4748
final PropertyBinder propertyBinder = beanBinder.bindBean(type, encounter);
4849
if (null == propertyBinder) {

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanProperties.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ public BeanProperties(final Class<?> clazz) {
4646
// Public methods
4747
// ----------------------------------------------------------------------
4848

49+
@Override
4950
public Iterator<BeanProperty<Object>> iterator() {
5051
return new BeanPropertyIterator<>(members);
5152
}

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanPropertyField.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,23 +41,27 @@ final class BeanPropertyField<T> implements BeanProperty<T>, PrivilegedAction<Vo
4141
// Public methods
4242
// ----------------------------------------------------------------------
4343

44+
@Override
4445
public <A extends Annotation> A getAnnotation(final Class<A> annotationType) {
4546
return field.getAnnotation(annotationType);
4647
}
4748

49+
@Override
4850
@SuppressWarnings("unchecked")
4951
public TypeLiteral<T> getType() {
5052
return (TypeLiteral<T>) TypeLiteral.get(field.getGenericType());
5153
}
5254

55+
@Override
5356
public String getName() {
5457
return field.getName();
5558
}
5659

60+
@Override
5761
public <B> void set(final B bean, final T value) {
5862
if (!field.isAccessible()) {
5963
// make sure we can apply the binding
60-
AccessController.doPrivileged(this);
64+
AccessController.doPrivileged(this); // NOSONAR
6165
}
6266

6367
BeanScheduler.detectCycle(value);
@@ -94,6 +98,7 @@ public String toString() {
9498
// PrivilegedAction methods
9599
// ----------------------------------------------------------------------
96100

101+
@Override
97102
public Void run() {
98103
// enable private injection
99104
field.setAccessible(true);

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanPropertyIterator.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ final class BeanPropertyIterator<T> implements Iterator<BeanProperty<T>> {
4444
// Public methods
4545
// ----------------------------------------------------------------------
4646

47+
@Override
4748
public boolean hasNext() {
4849
while (null == nextProperty) {
4950
if (!memberIterator.hasNext()) {
@@ -70,6 +71,7 @@ public boolean hasNext() {
7071
return true;
7172
}
7273

74+
@Override
7375
public BeanProperty<T> next() {
7476
if (hasNext()) {
7577
// initialized by hasNext()
@@ -80,6 +82,7 @@ public BeanProperty<T> next() {
8082
throw new NoSuchElementException();
8183
}
8284

85+
@Override
8386
public void remove() {
8487
throw new UnsupportedOperationException();
8588
}

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanPropertySetter.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,39 @@ final class BeanPropertySetter<T> implements BeanProperty<T>, PrivilegedAction<V
4242
// Public methods
4343
// ----------------------------------------------------------------------
4444

45+
@Override
4546
public <A extends Annotation> A getAnnotation(final Class<A> annotationType) {
4647
return method.getAnnotation(annotationType);
4748
}
4849

50+
@Override
4951
@SuppressWarnings("unchecked")
5052
public TypeLiteral<T> getType() {
5153
return (TypeLiteral<T>) TypeLiteral.get(method.getGenericParameterTypes()[0]);
5254
}
5355

56+
@Override
5457
public String getName() {
5558
final String name = method.getName();
5659

5760
// this is guaranteed OK by the checks made in the BeanProperties code
5861
return Character.toLowerCase(name.charAt(3)) + name.substring(4);
5962
}
6063

64+
@Override
6165
public <B> void set(final B bean, final T value) {
6266
if (!method.isAccessible()) {
6367
// ensure we can update the property
64-
AccessController.doPrivileged(this);
68+
AccessController.doPrivileged(this); // NOSONAR
6569
}
6670

6771
BeanScheduler.detectCycle(value);
6872

6973
try {
7074
method.invoke(bean, value);
71-
} catch (final Exception e) {
75+
} catch (final LinkageError | Exception e) {
7276
final Throwable cause = e instanceof InvocationTargetException ? e.getCause() : e;
7377
throw new ProvisionException("Error injecting: " + method, cause);
74-
} catch (final LinkageError e) {
75-
throw new ProvisionException("Error injecting: " + method, e);
7678
}
7779
}
7880

@@ -101,6 +103,7 @@ public String toString() {
101103
// PrivilegedAction methods
102104
// ----------------------------------------------------------------------
103105

106+
@Override
104107
public Void run() {
105108
// enable private injection
106109
method.setAccessible(true);

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/BeanScheduler.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ public abstract class BeanScheduler {
7272
* Enables deferred activation of component cycles, only needed in legacy systems like Plexus.
7373
*/
7474
public static final Module MODULE = new Module() {
75+
@Override
7576
public void configure(final Binder binder) {
7677
if (null != CYCLE_ACTIVATOR) {
7778
binder.bindListener(Matchers.any(), (com.google.inject.spi.ProvisionListener) CYCLE_ACTIVATOR);
@@ -175,6 +176,7 @@ protected Boolean visitOther() {
175176
}
176177
};
177178

179+
@Override
178180
public <T> void onProvision(final ProvisionInvocation<T> pi) {
179181
// Only scoped dependencies like singletons are candidates for dependency cycles
180182
if (Boolean.TRUE.equals(pi.getBinding().acceptScopingVisitor(IS_SCOPED))) {

org.eclipse.sisu.inject/src/main/java/org/eclipse/sisu/bean/DeclaredMembers.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public DeclaredMembers(final Class<?> clazz, final View... views) {
4141
// Public methods
4242
// ----------------------------------------------------------------------
4343

44+
@Override
4445
public Iterator<Member> iterator() {
4546
return new MemberIterator(clazz, views);
4647
}
@@ -87,6 +88,7 @@ private static final class MemberIterator implements Iterator<Member> {
8788
// Public methods
8889
// ----------------------------------------------------------------------
8990

91+
@Override
9092
public boolean hasNext() {
9193
while (memberIndex <= 0) {
9294
if (viewIndex >= views.length) {
@@ -107,6 +109,7 @@ public boolean hasNext() {
107109
return true;
108110
}
109111

112+
@Override
110113
public Member next() {
111114
if (hasNext()) {
112115
// initialized by hasNext()
@@ -115,6 +118,7 @@ public Member next() {
115118
throw new NoSuchElementException();
116119
}
117120

121+
@Override
118122
public void remove() {
119123
throw new UnsupportedOperationException();
120124
}

0 commit comments

Comments
 (0)