Skip to content
Snippets Groups Projects
Commit f448b64a authored by felmer's avatar felmer
Browse files

SSDM-2789: remove not used classes and packages

SVN: 35137
parent 2d54b824
No related merge requests found
/*
* Copyright 2014 ETH Zuerich, Scientific IT Services
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ch.ethz.sis.openbis.generic.shared.api.v3.dto.entity.deletion;
import java.io.Serializable;
import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author pkupczyk
*/
@JsonObject("dto.entity.deletion.DeletionType")
public enum DeletionType implements Serializable
{
PERMANENT, TRASH
}
...@@ -19,7 +19,6 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.id; ...@@ -19,7 +19,6 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.id;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import ch.ethz.sis.openbis.generic.shared.api.v3.util.JsonPropertyUtil;
import ch.systemsx.cisd.base.annotation.JsonObject; import ch.systemsx.cisd.base.annotation.JsonObject;
/** /**
...@@ -65,13 +64,13 @@ public class ObjectTechId implements IObjectId ...@@ -65,13 +64,13 @@ public class ObjectTechId implements IObjectId
@JsonProperty("id") @JsonProperty("id")
private String getIdAsString() private String getIdAsString()
{ {
return JsonPropertyUtil.toStringOrNull(techId); return techId == null ? null : techId.toString();
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
private void setIdAsString(String id) private void setIdAsString(String id)
{ {
this.techId = JsonPropertyUtil.toLongOrNull(id); this.techId = id == null ? null : Long.valueOf(id);
} }
@Override @Override
......
/*
* Copyright 2013 ETH Zuerich, CISD
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ch.ethz.sis.openbis.generic.shared.api.v3.util;
/**
* @author pkupczyk
*/
public class JsonPropertyUtil
{
public static final String toStringOrNull(final Long longOrNull)
{
return longOrNull == null ? null : longOrNull.toString();
}
public static final Long toLongOrNull(final String stringOrNull)
{
return stringOrNull == null ? null : Long.valueOf(stringOrNull);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment