Skip to content

Commit

Permalink
Revert "GEODE-9486: Fix validate-serializable-objects (apache#6746)" (a…
Browse files Browse the repository at this point in the history
…pache#6816)

This reverts commit 3b2c531.
  • Loading branch information
kirklund authored Sep 1, 2021
1 parent 89dba01 commit 25f70a7
Show file tree
Hide file tree
Showing 110 changed files with 1,135 additions and 2,322 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,9 @@
*/
package org.apache.geode.codeAnalysis;

import org.junit.experimental.categories.Category;

import org.apache.geode.redis.internal.RedisSanctionedSerializablesService;
import org.apache.geode.test.junit.categories.SerializationTest;
import org.apache.geode.redis.internal.GeodeRedisService;

@Category(SerializationTest.class)
public class AnalyzeRedisSerializablesIntegrationTest extends AnalyzeSerializablesJUnitTestBase {

@Override
Expand All @@ -28,7 +25,7 @@ protected String getModuleName() {
}

@Override
protected Class<?> getModuleClass() {
return RedisSanctionedSerializablesService.class;
protected Class getModuleClass() {
return GeodeRedisService.class;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This is a list of classes excluded due to open bugs about their having
# incompatible changes. There should be no entries in this file at the
# time of a product release.

# Each entry should be a bug number followed by a comma and the
# full class name. The package components can be delimited with a period
# or a comma. Don't include ".class" or ".java" at the end of the name.

# example: 50174,org/apache/geode/distributed/internal/StartupResponseWithVersionMessage
# example: 50175,com.gemstone.org.jgroups.Message$Header


# ~~~~~~~~~~~~~~~~~~~ DataSerializables ~~~~~~~~~~~~~~~~~~~~~~~~~
# these are failures from testDataSerializables


# ~~~~~~~~~~~~~~~~~~~ Serializables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# these are failures from testSerializables



Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to You 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 org.apache.geode.redis.internal;

import java.io.IOException;
import java.net.URL;
import java.util.Collection;

import org.apache.geode.distributed.internal.DistributedSystemService;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.InternalDataSerializer;
import org.apache.geode.internal.classloader.ClassPathLoader;

public class RedisDistributedSystemService implements DistributedSystemService {
@Override
public void init(InternalDistributedSystem internalDistributedSystem) {

}

@Override
public Class getInterface() {
return getClass();
}

@Override
public Collection<String> getSerializationAcceptlist() throws IOException {
URL sanctionedSerializables = ClassPathLoader.getLatest().getResource(getClass(),
"sanctioned-geode-apis-compatible-with-redis-serializables.txt");
return InternalDataSerializer.loadClassNames(sanctionedSerializables);
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
org.apache.geode.redis.internal.RedisDistributedSystemService

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,7 @@ public HttpResponse doRequest(HttpRequestBase request, String username, String p

return clientBuilder.build().execute(host, request, clientContext);
} catch (Exception e) {
throw new RuntimeException(
String.format("Request %s' with username '%s' password '%s' failed", request, username,
password),
e);
throw new RuntimeException(e.getMessage(), e);
}
}

Expand Down
Loading

0 comments on commit 25f70a7

Please sign in to comment.