/*
 * Copyright Terracotta, Inc.
 *
 * 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 org.ehcache.jsr107;

import java.net.URI;

import javax.cache.CacheException;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;

/**
 * @author teck
 */
abstract class Eh107MXBean {

  private final ObjectName objectName;

  Eh107MXBean(String cacheName, URI cacheManagerURI, final String beanName) {
    this.objectName = createObjectName(cacheName, cacheManagerURI, beanName);
  }

  private String sanitize(String string) {
    return string == null ? "" : string.replaceAll(",|:|=|\n", ".");
  }

  private ObjectName createObjectName(String cacheName, URI cacheManagerURI, String beanName) {
    String cacheManagerName = sanitize(cacheManagerURI != null ? cacheManagerURI.toString() : "null");
    cacheName = sanitize(cacheName != null ? cacheName : "null");

    // The classloader should really be used as part of the ObjectName IMO, but
    // the TCK would fail with that

    try {
      return new ObjectName("javax.cache:type=" + beanName + ",CacheManager=" + cacheManagerName + ",Cache="
          + cacheName);
    } catch (MalformedObjectNameException e) {
      throw new CacheException(e);
    }
  }

  ObjectName getObjectName() {
    return this.objectName;
  }

}

@@ -1291,34 +1291,8 @@
 rURI
- != null ? cacheManagerURI
 .toS
@@ -1298,25 +1298,16 @@
 String()
- : %22null%22
 );%0A    c
@@ -1339,37 +1339,8 @@
 Name
- != null ? cacheName : %22null%22
 );%0A%0A

Remove not required null checks