From 2a3b1ae1a52f91474064332df92ab132fa803089 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 23 Mar 2015 09:47:10 +0000
Subject: [PATCH] ServiceVersionHolder.VERSION changed back to its previous
value. A comment states not to change this number anymore on order to avoid
breaking API V1/V2 backwards compatibility. Fixing in API V3 two DTO classes
which referred to this version number.
SVN: 33703
---
.../generic/shared/api/v3/dto/id/sample/SampleIdentifier.java | 2 +-
.../generic/shared/api/v3/dto/id/sample/SamplePermId.java | 3 +--
.../openbis/generic/shared/basic/dto/ServiceVersionHolder.java | 2 +-
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SampleIdentifier.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SampleIdentifier.java
index 155a7c979af..31543f488b7 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SampleIdentifier.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SampleIdentifier.java
@@ -29,7 +29,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
public class SampleIdentifier extends ObjectIdentifier implements ISampleId
{
- private static final long serialVersionUID = ServiceVersionHolder.VERSION;
+ private static final long serialVersionUID = 1L;
/**
* @param identifier Sample identifier, e.g. "/MY_SPACE/MY_SAMPLE" (space sample) or "/MY_SAMPLE" (shared sample)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SamplePermId.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SamplePermId.java
index bd658b031ab..aa091127c6c 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SamplePermId.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/id/sample/SamplePermId.java
@@ -18,7 +18,6 @@ package ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.sample;
import ch.ethz.sis.openbis.generic.shared.api.v3.dto.id.ObjectPermId;
import ch.systemsx.cisd.base.annotation.JsonObject;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
/**
* Sample perm id.
@@ -29,7 +28,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder;
public class SamplePermId extends ObjectPermId implements ISampleId
{
- private static final long serialVersionUID = ServiceVersionHolder.VERSION;
+ private static final long serialVersionUID = 1L;
/**
* @param permId Sample perm id, e.g. "201108050937246-1031".
diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java
index d14196e7daa..3f2fc099d80 100644
--- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java
+++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/ServiceVersionHolder.java
@@ -23,5 +23,5 @@ package ch.systemsx.cisd.openbis.generic.shared.basic.dto;
*/
public final class ServiceVersionHolder
{
- public static final int VERSION = 36; // for S190
+ public static final int VERSION = 35; // do not change, because it breaks API V1/V2
}
--
GitLab