Added license header and fixed sonar issue: Fields and methods should not have conflicting names
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
This commit is contained in:
@@ -81,7 +81,7 @@ public class Target extends NamedEntity implements Persistable<Long> {
|
|||||||
private String controllerId;
|
private String controllerId;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private boolean isNew = false;
|
private boolean entityNew = false;
|
||||||
|
|
||||||
@ManyToMany(targetEntity = TargetTag.class)
|
@ManyToMany(targetEntity = TargetTag.class)
|
||||||
@JoinTable(name = "sp_target_target_tag", joinColumns = {
|
@JoinTable(name = "sp_target_target_tag", joinColumns = {
|
||||||
@@ -217,15 +217,15 @@ public class Target extends NamedEntity implements Persistable<Long> {
|
|||||||
@Override
|
@Override
|
||||||
@Transient
|
@Transient
|
||||||
public boolean isNew() {
|
public boolean isNew() {
|
||||||
return isNew;
|
return entityNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param isNew
|
* @param isNew
|
||||||
* the isNew to set
|
* the isNew to set
|
||||||
*/
|
*/
|
||||||
public void setNew(final boolean isNew) {
|
public void setNew(final boolean entityNew) {
|
||||||
this.isNew = isNew;
|
this.entityNew = entityNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -73,7 +73,7 @@ public class TargetInfo implements Persistable<Long>, Serializable {
|
|||||||
private Long targetId;
|
private Long targetId;
|
||||||
|
|
||||||
@Transient
|
@Transient
|
||||||
private boolean isNew = false;
|
private boolean entityNew = false;
|
||||||
|
|
||||||
@CascadeOnDelete
|
@CascadeOnDelete
|
||||||
@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REMOVE }, fetch = FetchType.LAZY, targetEntity = Target.class)
|
@OneToOne(cascade = { CascadeType.MERGE, CascadeType.REMOVE }, fetch = FetchType.LAZY, targetEntity = Target.class)
|
||||||
@@ -154,15 +154,15 @@ public class TargetInfo implements Persistable<Long>, Serializable {
|
|||||||
@Override
|
@Override
|
||||||
@Transient
|
@Transient
|
||||||
public boolean isNew() {
|
public boolean isNew() {
|
||||||
return isNew;
|
return entityNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param isNew
|
* @param isNew
|
||||||
* the isNew to set
|
* the isNew to set
|
||||||
*/
|
*/
|
||||||
public void setNew(final boolean isNew) {
|
public void setNew(final boolean entityNew) {
|
||||||
this.isNew = isNew;
|
this.entityNew = entityNew;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,5 +1,10 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2011-2016 Bosch Software Innovations GmbH, Germany. All rights reserved.
|
* Copyright (c) 2015 Bosch Software Innovations GmbH 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.eclipse.hawkbit.repository.utils;
|
package org.eclipse.hawkbit.repository.utils;
|
||||||
|
|
||||||
@@ -9,8 +14,6 @@ import java.util.concurrent.Callable;
|
|||||||
* Helper to call a request multiple times regarding a given condition until
|
* Helper to call a request multiple times regarding a given condition until
|
||||||
* timeout is reached.
|
* timeout is reached.
|
||||||
*
|
*
|
||||||
* @author Jonathan Knoblauch
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public final class MultipleInvokeHelper {
|
public final class MultipleInvokeHelper {
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,16 @@
|
|||||||
/**
|
/**
|
||||||
* Copyright (c) 2011-2015 Bosch Software Innovations GmbH, Germany. All rights reserved.
|
* Copyright (c) 2015 Bosch Software Innovations GmbH 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.eclipse.hawkbit.repository.utils;
|
package org.eclipse.hawkbit.repository.utils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* SuccessCondition Interface.
|
* SuccessCondition Interface.
|
||||||
*
|
*
|
||||||
* @author Dennis Melzer
|
|
||||||
*
|
|
||||||
* @param <T>
|
* @param <T>
|
||||||
* type of the value to get verified
|
* type of the value to get verified
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user